diff --git a/app/Abstracts/View/Components/Documents/Form.php b/app/Abstracts/View/Components/Documents/Form.php
index c6f7f76e7..2ffa97220 100644
--- a/app/Abstracts/View/Components/Documents/Form.php
+++ b/app/Abstracts/View/Components/Documents/Form.php
@@ -603,20 +603,18 @@ abstract class Form extends Component
             return $textCreateNewContact;
         }
 
-        /*
         $default_key = Str::plural(config('type.document.' . $type . '.contact_type'), 2);
 
         $translation = $this->getTextFromConfig($type, 'create_new_contact', $default_key, 'trans_choice');
 
         if (!empty($translation)) {
             return [
-                'general.form.add_new',
+                'general.title.new',
                 $translation,
             ];
         }
-        */
 
-        return 'general.add_new';
+        return 'general.title.add';
     }
 
     protected function getTextEditContact($type, $textEditContact)
diff --git a/app/View/Components/Documents/Form/Contact.php b/app/View/Components/Documents/Form/Contact.php
index cffaeecbc..01ffbfb2b 100644
--- a/app/View/Components/Documents/Form/Contact.php
+++ b/app/View/Components/Documents/Form/Contact.php
@@ -132,8 +132,8 @@ class Contact extends Component
 
     protected function getTextCreateNewContact($type, $textCreateNewContact)
     {
-        if (!empty($textCreateNewContact)) {
-            return $textCreateNewContact;
+        if (!empty($textCreateNewContact) && is_array($textCreateNewContact)) {
+            return trans($textCreateNewContact[0], ['type' => trans_choice($textCreateNewContact[1], 1)]);
         }
 
         switch ($type) {
diff --git a/app/View/Components/Form/Group/Country.php b/app/View/Components/Form/Group/Country.php
index b54a86b17..14caf9a76 100644
--- a/app/View/Components/Form/Group/Country.php
+++ b/app/View/Components/Form/Group/Country.php
@@ -8,6 +8,18 @@ class Country extends Form
 {
     public $type = 'country';
 
+    /** @var string */
+    public $formGroupClass;
+
+    /**
+     * Create a new component instance.
+     *
+     * @return void
+     */
+    public function __construct(string $formGroupClass = 'sm:col-span-3') {
+        $this->formGroupClass = $formGroupClass;
+    }
+    
     /**
      * Get the view / contents that represent the component.
      *
diff --git a/resources/assets/js/components/AkauntingContactCard.vue b/resources/assets/js/components/AkauntingContactCard.vue
index 1e9d54a49..4b335816a 100644
--- a/resources/assets/js/components/AkauntingContactCard.vue
+++ b/resources/assets/js/components/AkauntingContactCard.vue
@@ -46,8 +46,9 @@
                             </div>
                         </ul>
 
-                        <div class="flex items-center justify-center h-11 text-center text-purple font-bold border border-l-0 border-r-0 border-b-0 rounded-bl-lg rounded-br-lg hover:bg-gray-100 cursor-pointer" tabindex="0" @click="onContactCreate">
-                            <span class="text-sm"> {{ createNewContactText }} </span>
+                        <div class="flex items-center justify-center h-11 text-sm text-center text-purple font-bold border border-l-0 border-r-0 border-b-0 rounded-bl-lg rounded-br-lg hover:bg-gray-100 cursor-pointer" tabindex="0" @click="onContactCreate">
+                            <span class="material-icons text-lg font-bold mr-1 mt-1">add</span>
+                            {{ createNewContactText }}
                         </div>
                     </div>
                 </div>
@@ -367,7 +368,7 @@ export default {
 
                 this.add_new_html = Vue.component('add-new-component', function (resolve, reject) {
                     resolve({
-                        template: '<div><akaunting-modal-add-new :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
+                        template: '<div><akaunting-modal-add-new modal-dialog-class="max-w-md" modal-position-top :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
 
                         components: {
                             [Select.name]: Select,
@@ -426,7 +427,7 @@ export default {
 
                 this.add_new_html = Vue.component('add-new-component', function (resolve, reject) {
                     resolve({
-                        template: '<div><akaunting-modal-add-new :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
+                        template: '<div><akaunting-modal-add-new modal-dialog-class="max-w-md" modal-position-top :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
 
                         components: {
                             [Select.name]: Select,
diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index bce06ef16..04ccf0970 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -583,7 +583,7 @@ export default {
 
                 this.add_new_html = Vue.component('add-new-component', function (resolve, reject) {
                     resolve({
-                        template: '<div><akaunting-modal-add-new :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
+                        template: '<div><akaunting-modal-add-new modal-dialog-class="max-w-md" :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
 
                         components: {
                             AkauntingModalAddNew,
diff --git a/resources/views/components/documents/form/contact.blade.php b/resources/views/components/documents/form/contact.blade.php
index d515a93de..3d643567e 100644
--- a/resources/views/components/documents/form/contact.blade.php
+++ b/resources/views/components/documents/form/contact.blade.php
@@ -14,7 +14,7 @@
     choose-different-contact-text="{{ is_array($textChooseDifferentContact) ? trans($textChooseDifferentContact[0], ['field' => Str::lower(trans_choice($textChooseDifferentContact[1], 1))]) : trans($textChooseDifferentContact) }}"
     :add-new="{{ json_encode([
         'status' => true,
-        'text' => trans('general.add_new'),
+        'text' => is_array($textCreateNewContact) ? trans($textCreateNewContact[0], ['field' => trans_choice($textCreateNewContact[1], 1)]) : trans($textCreateNewContact),
         'new_text' => trans('modules.new'),
         'buttons' => [
             'cancel' => [
diff --git a/resources/views/components/documents/form/item-button.blade.php b/resources/views/components/documents/form/item-button.blade.php
index f4855e6d3..7a521b6a2 100644
--- a/resources/views/components/documents/form/item-button.blade.php
+++ b/resources/views/components/documents/form/item-button.blade.php
@@ -9,5 +9,5 @@
     :search-char-limit="{{ $searchCharLimit }}"
     @item="onSelectedItem($event)"
     add-item-text="{{ trans('general.form.add_an', ['field' => trans_choice('general.items', 1)]) }}"
-    create-new-item-text="{{ trans('general.title.create', ['type' =>  trans_choice('general.items', 1)]) }}"
+    create-new-item-text="{{ trans('general.title.new', ['type' =>  trans_choice('general.items', 1)]) }}"
 ></akaunting-item-button>
diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 324dc7577..fe98b5940 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -350,7 +350,7 @@
                                     :value="tax_id"
                                     :add-new="{{ json_encode([
                                         'status' => true,
-                                        'text' => trans('general.add_new'),
+                                        'text' => trans('general.title.new', ['type' => trans_choice('general.taxes', 1)]),
                                         'path' => route('modals.taxes.create'),
                                         'type' => 'modal',
                                         'field' => [
diff --git a/resources/views/components/form/group/country.blade.php b/resources/views/components/form/group/country.blade.php
index 567d7c826..d6a2a178b 100644
--- a/resources/views/components/form/group/country.blade.php
+++ b/resources/views/components/form/group/country.blade.php
@@ -5,4 +5,5 @@
     :selected="setting('company.country')"
     not-required
     model="form.country"
+    form-group-class="{{ $formGroupClass }}"
 />
diff --git a/resources/views/components/form/group/select.blade.php b/resources/views/components/form/group/select.blade.php
index f78572c87..e71d52ef0 100644
--- a/resources/views/components/form/group/select.blade.php
+++ b/resources/views/components/form/group/select.blade.php
@@ -74,7 +74,7 @@
         @if (! empty($addNew))
         :add-new="{{ json_encode([
             'status' => true,
-            'text' => trans('general.add_new'),
+            'text' => trans('general.title.new', ['type' => $label ?? '']),
             'path' => isset($attributes['path']) ? $attributes['path']: false,
             'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
             'field' => [
diff --git a/resources/views/modals/currencies/create.blade.php b/resources/views/modals/currencies/create.blade.php
index b351eb3f1..11ba6a175 100644
--- a/resources/views/modals/currencies/create.blade.php
+++ b/resources/views/modals/currencies/create.blade.php
@@ -1,10 +1,10 @@
 <x-form id="form-create-currency" route="modals.currencies.store">
     <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
-        <x-form.group.text name="name" label="{{ trans('general.name') }}" />
+        <x-form.group.text name="name" label="{{ trans('general.name') }}" form-group-class="col-span-6" />
 
-        <x-form.group.select name="code" label="{{ trans('currencies.code') }}" :options="$codes" />
+        <x-form.group.select name="code" label="{{ trans('currencies.code') }}" :options="$codes" form-group-class="col-span-6" />
 
-        <x-form.group.text name="rate" label="{{ trans('currencies.rate') }}" @input="onChangeRate" />
+        <x-form.group.text name="rate" label="{{ trans('currencies.rate') }}" @input="onChangeRate" form-group-class="col-span-6" />
 
         <x-form.input.hidden name="enabled" value="1" />
         <x-form.input.hidden name="symbol_first" value="1" />
diff --git a/resources/views/modals/customers/create.blade.php b/resources/views/modals/customers/create.blade.php
index cd8bddddf..635760be7 100644
--- a/resources/views/modals/customers/create.blade.php
+++ b/resources/views/modals/customers/create.blade.php
@@ -1,18 +1,90 @@
 <x-form id="form-create-customer" route="customers.store">
-    <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
-        <x-form.group.text name="name" label="{{ trans('general.name') }}" />
+    <div x-data="{ active: 'general' }">
+        <div>
+            <div>
+                <ul class="grid grid-cols-6">
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-general"
+                        data-id="tab-general"
+                        data-tabs="general"
+                        x-on:click="active = 'general'"
+                        x-bind:class="active != 'general' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans('general.general') }}
 
-        <x-form.group.text name="email" label="{{ trans('general.email') }}" not-required />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('name')||form.errors.has('email')||form.errors.has('phone')||form.errors.has('tax_number')||form.errors.has('currency_code')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
 
-        <x-form.group.text name="tax_number" label="{{ trans('general.tax_number') }}" not-required />
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-address"
+                        data-id="tab-address"
+                        data-tabs="address"
+                        x-on:click="active = 'address'"
+                        x-bind:class="active != 'address' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans('general.address') }}
 
-        <x-form.group.currency without-add-new />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('address')||form.errors.has('city')||form.errors.has('zip_code')||form.errors.has('state')||form.errors.has('country')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
 
-        <x-form.group.textarea name="address" label="{{ trans('general.address') }}" />
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-other"
+                        data-id="tab-other"
+                        data-tabs="other"
+                        x-on:click="active = 'other'"
+                        x-bind:class="active != 'other' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans_choice('general.others', 1) }}
 
-        <x-form.group.country />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('website')||form.errors.has('reference')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
+                </ul>
+            </div>
+        </div>
 
-        <x-form.input.hidden name="type" value="customer" />
-        <x-form.input.hidden name="enabled" value="1" />
+        <div id="tab-general" data-tabs-content="general" x-show="active === 'general'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
+                <x-form.group.text name="name" label="{{ trans('general.name') }}" form-group-class="col-span-6" />
+
+                <x-form.group.text name="email" label="{{ trans('general.email') }}" form-group-class="col-span-6" not-required />
+        
+                <x-form.group.text name="phone" label="{{ trans('general.phone') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="tax_number" label="{{ trans('general.tax_number') }}" form-group-class="col-span-6" not-required />
+        
+                <x-form.group.currency without-add-new form-group-class="col-span-6" :add-new-text="trans_choice('general.currencies', 1)" />
+            </div>
+        </div>
+        
+        <div id="tab-address" data-tabs-content="address" x-show="active === 'address'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">      
+                <x-form.group.textarea name="address" label="{{ trans('general.address') }}" form-group-class="col-span-6" rows=2 not-required />
+        
+                <x-form.group.text name="city" label="{{ trans_choice('general.cities', 1) }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="zip_code" label="{{ trans('general.zip_code') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" />
+            </div>
+        </div>
+
+        <div id="tab-other" data-tabs-content="other" x-show="active === 'other'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
+                <x-form.group.text name="website" label="{{ trans('general.website') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="reference" label="{{ trans('general.reference') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.input.hidden name="type" value="customer" />
+                <x-form.input.hidden name="enabled" value="1" />
+            </div>
+        </div>
     </div>
 </x-form>
diff --git a/resources/views/modals/customers/edit.blade.php b/resources/views/modals/customers/edit.blade.php
index 03c307b5d..2f5edb840 100644
--- a/resources/views/modals/customers/edit.blade.php
+++ b/resources/views/modals/customers/edit.blade.php
@@ -1,18 +1,90 @@
 <x-form id="form-edit-customer" method="PATCH" :route="['customers.update', $customer->id]" :model="$customer">
-    <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
-        <x-form.group.text name="name" label="{{ trans('general.name') }}" />
+    <div x-data="{ active: 'general' }">
+        <div>
+            <div>
+                <ul class="grid grid-cols-6">
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-general"
+                        data-id="tab-general"
+                        data-tabs="general"
+                        x-on:click="active = 'general'"
+                        x-bind:class="active != 'general' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans('general.general') }}
 
-        <x-form.group.text name="email" label="{{ trans('general.email') }}" not-required />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('name')||form.errors.has('email')||form.errors.has('phone')||form.errors.has('tax_number')||form.errors.has('currency_code')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
 
-        <x-form.group.text name="tax_number" label="{{ trans('general.tax_number') }}" not-required />
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-address"
+                        data-id="tab-address"
+                        data-tabs="address"
+                        x-on:click="active = 'address'"
+                        x-bind:class="active != 'address' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans('general.address') }}
 
-        <x-form.group.currency without-add-new />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('address')||form.errors.has('city')||form.errors.has('zip_code')||form.errors.has('state')||form.errors.has('country')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
 
-        <x-form.group.textarea name="address" label="{{ trans('general.address') }}" />
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-other"
+                        data-id="tab-other"
+                        data-tabs="other"
+                        x-on:click="active = 'other'"
+                        x-bind:class="active != 'other' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans_choice('general.others', 1) }}
 
-        <x-form.group.country />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('website')||form.errors.has('reference')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
+                </ul>
+            </div>
+        </div>
 
-        <x-form.input.hidden name="type" value="customer" />
-        <x-form.input.hidden name="enabled" value="1" />
+        <div id="tab-general" data-tabs-content="general" x-show="active === 'general'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
+                <x-form.group.text name="name" label="{{ trans('general.name') }}" form-group-class="col-span-6" />
+
+                <x-form.group.text name="email" label="{{ trans('general.email') }}" form-group-class="col-span-6" not-required />
+        
+                <x-form.group.text name="phone" label="{{ trans('general.phone') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="tax_number" label="{{ trans('general.tax_number') }}" form-group-class="col-span-6" not-required />
+        
+                <x-form.group.currency without-add-new form-group-class="col-span-6" />
+            </div>
+        </div>
+        
+        <div id="tab-address" data-tabs-content="address" x-show="active === 'address'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">      
+                <x-form.group.textarea name="address" label="{{ trans('general.address') }}" form-group-class="col-span-6" not-required />
+        
+                <x-form.group.text name="city" label="{{ trans_choice('general.cities', 1) }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="zip_code" label="{{ trans('general.zip_code') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" />
+            </div>
+        </div>
+
+        <div id="tab-other" data-tabs-content="other" x-show="active === 'other'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
+                <x-form.group.text name="website" label="{{ trans('general.website') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="reference" label="{{ trans('general.reference') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.input.hidden name="type" value="customer" />
+                <x-form.input.hidden name="enabled" value="1" />
+            </div>
+        </div>
     </div>
 </x-form>
diff --git a/resources/views/modals/taxes/create.blade.php b/resources/views/modals/taxes/create.blade.php
index a0875194a..3315c8a3e 100644
--- a/resources/views/modals/taxes/create.blade.php
+++ b/resources/views/modals/taxes/create.blade.php
@@ -1,9 +1,9 @@
 
 <x-form id="form-create-tax" route="taxes.store">
     <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
-        <x-form.group.text name="name" label="{{ trans('general.name') }}" />
+        <x-form.group.text name="name" label="{{ trans('general.name') }}" form-group-class="col-span-6" />
 
-        <x-form.group.text name="rate" label="{{ trans('taxes.rate') }}" />
+        <x-form.group.text name="rate" label="{{ trans('taxes.rate') }}" form-group-class="col-span-6" />
 
         <x-form.input.hidden name="type" value="normal" />
         <x-form.input.hidden name="enabled" value="1" />
diff --git a/resources/views/modals/vendors/create.blade.php b/resources/views/modals/vendors/create.blade.php
index 3815d8621..acf33f18a 100644
--- a/resources/views/modals/vendors/create.blade.php
+++ b/resources/views/modals/vendors/create.blade.php
@@ -1,18 +1,90 @@
 <x-form id="form-create-vendor" route="vendors.store">
-    <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
-        <x-form.group.text name="name" label="{{ trans('general.name') }}" />
+    <div x-data="{ active: 'general' }">
+        <div>
+            <div>
+                <ul class="grid grid-cols-6">
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-general"
+                        data-id="tab-general"
+                        data-tabs="general"
+                        x-on:click="active = 'general'"
+                        x-bind:class="active != 'general' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans('general.general') }}
 
-        <x-form.group.text name="email" label="{{ trans('general.email') }}" not-required />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('name')||form.errors.has('email')||form.errors.has('phone')||form.errors.has('tax_number')||form.errors.has('currency_code')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
 
-        <x-form.group.text name="tax_number" label="{{ trans('general.tax_number') }}" not-required />
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-address"
+                        data-id="tab-address"
+                        data-tabs="address"
+                        x-on:click="active = 'address'"
+                        x-bind:class="active != 'address' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans('general.address') }}
 
-        <x-form.group.currency without-add-new />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('address')||form.errors.has('city')||form.errors.has('zip_code')||form.errors.has('state')||form.errors.has('country')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
 
-        <x-form.group.textarea name="address" label="{{ trans('general.address') }}" />
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-other"
+                        data-id="tab-other"
+                        data-tabs="other"
+                        x-on:click="active = 'other'"
+                        x-bind:class="active != 'other' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans_choice('general.others', 1) }}
 
-        <x-form.group.country />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('website')||form.errors.has('reference')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
+                </ul>
+            </div>
+        </div>
 
-        <x-form.input.hidden name="type" value="vendor" />
-        <x-form.input.hidden name="enabled" value="1" />
+        <div id="tab-general" data-tabs-content="general" x-show="active === 'general'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
+                <x-form.group.text name="name" label="{{ trans('general.name') }}" form-group-class="col-span-6" />
+
+                <x-form.group.text name="email" label="{{ trans('general.email') }}" form-group-class="col-span-6" not-required />
+        
+                <x-form.group.text name="phone" label="{{ trans('general.phone') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="tax_number" label="{{ trans('general.tax_number') }}" form-group-class="col-span-6" not-required />
+        
+                <x-form.group.currency without-add-new form-group-class="col-span-6" />
+            </div>
+        </div>
+        
+        <div id="tab-address" data-tabs-content="address" x-show="active === 'address'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">      
+                <x-form.group.textarea name="address" label="{{ trans('general.address') }}" form-group-class="col-span-6" not-required />
+        
+                <x-form.group.text name="city" label="{{ trans_choice('general.cities', 1) }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="zip_code" label="{{ trans('general.zip_code') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" />
+            </div>
+        </div>
+
+        <div id="tab-other" data-tabs-content="other" x-show="active === 'other'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
+                <x-form.group.text name="website" label="{{ trans('general.website') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="reference" label="{{ trans('general.reference') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.input.hidden name="type" value="vendor" />
+                <x-form.input.hidden name="enabled" value="1" />
+            </div>
+        </div>
     </div>
 </x-form>
diff --git a/resources/views/modals/vendors/edit.blade.php b/resources/views/modals/vendors/edit.blade.php
index 1c3c8fc27..8e1fc92e6 100644
--- a/resources/views/modals/vendors/edit.blade.php
+++ b/resources/views/modals/vendors/edit.blade.php
@@ -1,18 +1,90 @@
 <x-form id="form-edit-vendor" method="PATCH" :route="['vendors.update', $vendor->id]" :model="$vendor">
-    <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
-        <x-form.group.text name="name" label="{{ trans('general.name') }}" />
+    <div x-data="{ active: 'general' }">
+        <div>
+            <div>
+                <ul class="grid grid-cols-6">
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-general"
+                        data-id="tab-general"
+                        data-tabs="general"
+                        x-on:click="active = 'general'"
+                        x-bind:class="active != 'general' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans('general.general') }}
 
-        <x-form.group.text name="email" label="{{ trans('general.email') }}" not-required />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('name')||form.errors.has('email')||form.errors.has('phone')||form.errors.has('tax_number')||form.errors.has('currency_code')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
 
-        <x-form.group.text name="tax_number" label="{{ trans('general.tax_number') }}" not-required />
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-address"
+                        data-id="tab-address"
+                        data-tabs="address"
+                        x-on:click="active = 'address'"
+                        x-bind:class="active != 'address' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans('general.address') }}
 
-        <x-form.group.currency without-add-new />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('address')||form.errors.has('city')||form.errors.has('zip_code')||form.errors.has('state')||form.errors.has('country')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
 
-        <x-form.group.textarea name="address" label="{{ trans('general.address') }}" />
+                    <li class="relative px-8 text-sm text-black text-center pb-2 cursor-pointer transition-all border-b tabs-link col-span-2"
+                        id="tab-other"
+                        data-id="tab-other"
+                        data-tabs="other"
+                        x-on:click="active = 'other'"
+                        x-bind:class="active != 'other' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
+                    >
+                        {{ trans_choice('general.others', 1) }}
 
-        <x-form.group.country />
+                        <span class="invalid-feedback block text-xs text-red whitespace-normal" v-if="form.errors.has('website')||form.errors.has('reference')">
+                            {{ trans('general.validation_error') }}
+                        </span>
+                    </li>
+                </ul>
+            </div>
+        </div>
 
-        <x-form.input.hidden name="type" value="vendor" />
-        <x-form.input.hidden name="enabled" value="1" />
+        <div id="tab-general" data-tabs-content="general" x-show="active === 'general'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
+                <x-form.group.text name="name" label="{{ trans('general.name') }}" form-group-class="col-span-6" />
+
+                <x-form.group.text name="email" label="{{ trans('general.email') }}" form-group-class="col-span-6" not-required />
+        
+                <x-form.group.text name="phone" label="{{ trans('general.phone') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="tax_number" label="{{ trans('general.tax_number') }}" form-group-class="col-span-6" not-required />
+        
+                <x-form.group.currency without-add-new form-group-class="col-span-6" />
+            </div>
+        </div>
+        
+        <div id="tab-address" data-tabs-content="address" x-show="active === 'address'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">      
+                <x-form.group.textarea name="address" label="{{ trans('general.address') }}" form-group-class="col-span-6" not-required />
+        
+                <x-form.group.text name="city" label="{{ trans_choice('general.cities', 1) }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="zip_code" label="{{ trans('general.zip_code') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" />
+            </div>
+        </div>
+
+        <div id="tab-other" data-tabs-content="other" x-show="active === 'other'">
+            <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
+                <x-form.group.text name="website" label="{{ trans('general.website') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.group.text name="reference" label="{{ trans('general.reference') }}" form-group-class="col-span-6" not-required />
+
+                <x-form.input.hidden name="type" value="vendor" />
+                <x-form.input.hidden name="enabled" value="1" />
+            </div>
+        </div>
     </div>
 </x-form>