diff --git a/packages/Webkul/Admin/src/Http/Controllers/Core/CurrencyController.php b/packages/Webkul/Admin/src/Http/Controllers/Core/CurrencyController.php
index 5146498b03f..880b27432af 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Core/CurrencyController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Core/CurrencyController.php
@@ -93,7 +93,7 @@ public function update($id)
 
         $this->currencyRepository->update($data, $id);
 
-        session()->flash('success', trans('admin::app.settings.currencies.update-success'));
+        session()->flash('success', trans('admin::app.settings.currencies.edit.update-success'));
 
         return redirect()->route('admin.currencies.index');
     }
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Core/LocaleController.php b/packages/Webkul/Admin/src/Http/Controllers/Core/LocaleController.php
index 71308fd561f..dfe37030ada 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Core/LocaleController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Core/LocaleController.php
@@ -95,7 +95,7 @@ public function update($id)
 
         $this->localeRepository->update($data, $id);
 
-        session()->flash('success', trans('admin::app.settings.locales.update-success'));
+        session()->flash('success', trans('admin::app.settings.locales.edit.update-success'));
 
         return redirect()->route('admin.locales.index');
     }
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxCategoryController.php b/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxCategoryController.php
index 5b66fee8f58..19c9e1002a7 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxCategoryController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxCategoryController.php
@@ -66,7 +66,7 @@ public function store()
         Event::dispatch('tax.tax_category.create.after', $taxCategory);
 
         return new JsonResource([
-            'message' => trans('admin::app.settings.taxes.tax-categories.create-success'),
+            'message' => trans('admin::app.settings.taxes.tax-categories.create.create-success'),
         ]);
     }
 
@@ -113,7 +113,7 @@ public function update($id)
 
         Event::dispatch('tax.tax_category.update.after', $taxCategory);
 
-        session()->flash('success', trans('admin::app.settings.taxes.tax-categories.update-success'));
+        session()->flash('success', trans('admin::app.settings.taxes.tax-categories.edit.update-success'));
 
         return redirect()->route('admin.tax_categories.index');
     }
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxRateController.php b/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxRateController.php
index 5e077a0f397..cd3a9e74455 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxRateController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxRateController.php
@@ -141,7 +141,7 @@ public function update($id)
 
         Event::dispatch('tax.tax_rate.update.after', $taxRate);
 
-        session()->flash('success', trans('admin::app.settings.tax-rates.update-success'));
+        session()->flash('success', trans('admin::app.settings.taxes.tax-rates.edit.update-success'));
 
         return redirect()->route('admin.tax_rates.index');
     }
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 3eff8c3d821..e8a11225dc3 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -196,6 +196,13 @@
                 'invoice-sent'           => 'Invoice sent successfully',
             ],
         ],
+
+        'transactions' => [
+            'index' => [
+                'title'       => 'Transactions',
+                'create-btn'  => 'Create Transactions',
+            ],
+        ],
     ],
 
     'customers' => [
@@ -383,15 +390,16 @@
             ],
 
             'edit'  => [
-                'cancel-btn'  => 'Cancel',
-                'code'        => 'Code',
-                'save-btn'    => 'Save Locale',
-                'general'     => 'General',
-                'title'       => 'Edit Locales',
-                'name'        => 'Name',
-                'direction'   => 'Direction',
-                'logo'        => 'Locale Logo',
-                'logo-path'   => 'Locale Path',
+                'cancel-btn'     => 'Cancel',
+                'code'           => 'Code',
+                'save-btn'       => 'Save Locale',
+                'general'        => 'General',
+                'title'          => 'Edit Locales',
+                'name'           => 'Name',
+                'direction'      => 'Direction',
+                'logo'           => 'Locale Logo',
+                'logo-path'      => 'Locale Path',
+                'update-success' => 'Locale Updated Successfully.',
 
             ],
         ],
@@ -426,6 +434,7 @@
                 'save-btn'           => 'Save Currency',
                 'symbol'             => 'Symbol',
                 'title'              => 'Edit Currency',
+                'update-success'     => 'Currency updated successfully.',
             ],
         ],
 
@@ -534,6 +543,9 @@
                     'save-btn'         => 'Save Tax Category',
                     'tax-rates'        => 'Tax Rates',
                     'title'            => 'Tax Categories',
+                    'add-tax-rates'    => 'Add Tax Rates',
+                    'empty-text'       => 'Tax Rates are not available please create new Tax Rates.',
+                    'create-success'   => 'New Tax Category Created',
                 ],
 
                 'edit' => [
@@ -546,10 +558,9 @@
                     'save-btn'         => 'Save Tax Category',
                     'select-tax-rates' => 'Select Tax Rates',
                     'title'            => 'Edit Tax Categories',
+                    'update-success'   => 'Successfully Updated Tax Category',
                 ],
 
-                'create-success'  => 'New Tax Category Created',
-                'update-success'  => 'Successfully Updated Tax Category',
             ],
 
             'tax-rates'   => [
@@ -592,6 +603,7 @@
                     'zip_code'       => 'Zip Code',
                     'zip_from'       => 'Zip From',
                     'zip_to'         => 'Zip To',
+                    'update-success' => 'Tax Rate Update Successfully',
                 ],
             ],
         ],
diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field.blade.php
index d3a14bee040..e0fc931bc72 100644
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field.blade.php
@@ -23,18 +23,6 @@
         action="" 
         enctype="multipart/form-data"
     >
-        <a href="{{ route('admin.configuration.index') }}">
-            <div class="flex items-center cursor-pointer">
-                <div class="inline-flex gap-x-[4px] items-center justify-between text-gray-600 text-center w-full max-w-max rounded-[6px]">
-                    <span class="icon-sort-left text-[24px]"></span>
-                </div>
-                
-                <p class="text-gray-600">
-                    @lang('admin::app.configuration.title') / {{ $title }}
-                </p>
-            </div>
-        </a>
-
         {{-- Save Inventory --}}
         <div class="flex gap-[16px] justify-between items-center mt-[14px] max-sm:flex-wrap">
             <p class="text-[20px] text-gray-800 font-bold">
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/transactions/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/transactions/index.blade.php
index 39088f5fd7b..117fd0305de 100644
--- a/packages/Webkul/Admin/src/Resources/views/sales/transactions/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/transactions/index.blade.php
@@ -81,7 +81,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                 href="{{ route('admin.sales.transactions.create') }}"
                 class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-gray-50 font-semibold cursor-pointer"
             >
-                @lang('admin::app.sales.transactions.create.add')
+                @lang('admin::app.sales.transactions.index.create-btn')
             </a>
         </div>
     </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php
index d503cbfebc7..3664791e42e 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php
@@ -29,7 +29,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                                 {!! view_render_event('bagisto.admin.settings.currencies.create.before') !!}
 
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.currencies.create.code')
                                     </x-admin::form.control-group.label>
 
@@ -51,7 +51,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                                 </x-admin::form.control-group>
 
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required"> 
                                         @lang('admin::app.settings.currencies.create.name')
                                     </x-admin::form.control-group.label>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
index 50934f9b347..d98e9300e46 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
@@ -49,7 +49,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                     </x-admin::form.control-group.control>
 
                     <x-admin::form.control-group class="mb-[10px]">
-                        <x-admin::form.control-group.label>
+                        <x-admin::form.control-group.label class="required">
                             @lang('admin::app.settings.currencies.edit.code')
                         </x-admin::form.control-group.label>
 
@@ -71,7 +71,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                     </x-admin::form.control-group>
 
                     <x-admin::form.control-group class="mb-[10px]">
-                        <x-admin::form.control-group.label>
+                        <x-admin::form.control-group.label class="required">
                             @lang('admin::app.settings.currencies.edit.name')
                         </x-admin::form.control-group.label>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
index d52212ce48b..8a43fc853cf 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
@@ -50,7 +50,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
 
                                 <!-- Code -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.create.code')
                                     </x-admin::form.control-group.label>
 
@@ -73,7 +73,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
 
                                 <!-- Name -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.create.name')
                                     </x-admin::form.control-group.label>
 
@@ -126,7 +126,7 @@ class="text-gray-600 !mb-[0px]"
 
                                 <!-- Contact name -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.create.contact-name')
                                     </x-admin::form.control-group.label>
 
@@ -149,7 +149,7 @@ class="text-gray-600 !mb-[0px]"
 
                                 <!-- Contact Email -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.create.contact-email')
                                     </x-admin::form.control-group.label>
 
@@ -172,7 +172,7 @@ class="text-gray-600 !mb-[0px]"
 
                                 <!-- Contact Number -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.create.contact-number')
                                     </x-admin::form.control-group.label>
 
@@ -224,7 +224,7 @@ class="text-gray-600 !mb-[0px]"
 
                                 <!-- Country -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.create.country')
                                     </x-admin::form.control-group.label>
                     
@@ -254,7 +254,7 @@ class="text-gray-600 !mb-[0px]"
                                         
                                 <!-- State -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.create.state')
                                     </x-admin::form.control-group.label>
                     
@@ -302,7 +302,7 @@ class="text-gray-600 !mb-[0px]"
 
                                 <!-- City -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.create.city')
                                     </x-admin::form.control-group.label>
 
@@ -325,7 +325,7 @@ class="text-gray-600 !mb-[0px]"
 
                                 <!-- Street -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.create.street')
                                     </x-admin::form.control-group.label>
 
@@ -348,7 +348,7 @@ class="text-gray-600 !mb-[0px]"
 
                                 <!-- postcode -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.create.postcode')
                                     </x-admin::form.control-group.label>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
index 0e1f049b87f..e75f740652e 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
@@ -55,7 +55,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
 
                                 <!-- Code -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.edit.code')
                                     </x-admin::form.control-group.label>
 
@@ -78,7 +78,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
 
                                 <!-- Name -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.edit.name')
                                     </x-admin::form.control-group.label>
 
@@ -131,7 +131,7 @@ class="text-gray-600 "
 
                                 <!-- Contact Name -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.edit.contact-name')
                                     </x-admin::form.control-group.label>
 
@@ -154,7 +154,7 @@ class="text-gray-600 "
 
                                 <!-- Contact Email -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.edit.contact-email')
                                     </x-admin::form.control-group.label>
 
@@ -229,7 +229,7 @@ class="text-gray-600 "
 
                                 <!-- Country -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.edit.country')
                                     </x-admin::form.control-group.label>
                     
@@ -257,7 +257,7 @@ class="text-gray-600 "
 
                                 <!-- State -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.edit.state')
                                     </x-admin::form.control-group.label>
                     
@@ -302,7 +302,7 @@ class="text-gray-600 "
 
                                 <!-- City -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.edit.city')
                                     </x-admin::form.control-group.label>
 
@@ -325,7 +325,7 @@ class="text-gray-600 "
 
                                 <!-- Street -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.edit.street')
                                     </x-admin::form.control-group.label>
 
@@ -348,7 +348,7 @@ class="text-gray-600 "
 
                                 <!-- Post Code -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.inventory-sources.edit.postcode')
                                     </x-admin::form.control-group.label>
 
@@ -482,7 +482,7 @@ class="text-gray-600 "
                 </x-admin::form>
             </div>
         </script>
-
+        
         <script type="module">
             app.component('v-inventory-edit-form', {
                 template: '#v-inventory-edit-form-template',
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
index 4af9a8ae875..d018f535845 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
@@ -28,7 +28,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                                 {!! view_render_event('bagisto.admin.settings.locale.create.before') !!}
 
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.locales.index.code')
                                     </x-admin::form.control-group.label>
 
@@ -49,7 +49,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                                 </x-admin::form.control-group>
 
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.locales.index.name')
                                     </x-admin::form.control-group.label>
 
@@ -70,7 +70,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                                 </x-admin::form.control-group>
                     
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.locales.index.direction')
                                     </x-admin::form.control-group.label>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
index ea227e7a0c7..0e99b061074 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
@@ -49,7 +49,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                     </x-admin::form.control-group.control>
 
                     <x-admin::form.control-group class="mb-[10px]">
-                        <x-admin::form.control-group.label>
+                        <x-admin::form.control-group.label class="required">
                             @lang('admin::app.settings.locales.edit.code')
                         </x-admin::form.control-group.label>
 
@@ -72,7 +72,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                     </x-admin::form.control-group>
 
                     <x-admin::form.control-group class="mb-[10px]">
-                        <x-admin::form.control-group.label>
+                        <x-admin::form.control-group.label class="required">
                             @lang('admin::app.settings.locales.edit.name')
                         </x-admin::form.control-group.label>
 
@@ -94,7 +94,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                     </x-admin::form.control-group>
         
                     <x-admin::form.control-group class="mb-[10px]">
-                        <x-admin::form.control-group.label>
+                        <x-admin::form.control-group.label class="required">
                             @lang('admin::app.settings.locales.edit.direction')
                         </x-admin::form.control-group.label>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php
index 26391551636..7197401d3c4 100644
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php
@@ -17,7 +17,7 @@
         </div>
     </div>
     
-    <x-admin::datagrid src="{{ route('admin.tax_categories.index') }}"></x-admin::datagrid>
+    <x-admin::datagrid src="{{ route('admin.tax_categories.index') }}" ref="taxCategory_data"></x-admin::datagrid>
 
     @pushOnce('scripts')
         <script type="text/x-template" id="v-create-tax-category-template">
@@ -126,35 +126,51 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                                         @lang('admin::app.settings.taxes.tax-categories.create.tax-rates')
                                     </p>
 
-                                    @foreach ($taxRates as $taxRate)
-                                        <x-admin::form.control-group class="flex gap-[10px] !mb-0 p-[6px]">
-                                            <x-admin::form.control-group.control
-                                                type="checkbox"
-                                                name="taxrates" 
-                                                :value="$taxRate->id"
-                                                :id="'taxrates_' . $taxRate->id"
-                                                :for="'taxrates_' . $taxRate->id"
-                                                rules="required"
-                                                :label="trans('admin::app.settings.taxes.tax-categories.create.tax-rates')"
-                                                :checked="in_array($taxRate['id'], $selectedOptions)"
-                                            >
-                                            </x-admin::form.control-group.control>
-                                                
-                                            <x-admin::form.control-group.label 
-                                                :for="'taxrates_' . $taxRate->id"
-                                                class="!text-[14px] !text-gray-600 cursor-pointer"
-                                            >
-                                                {{ $taxRate->identifier }}
-                                            </x-admin::form.control-group.label>
-    
-                                        </x-admin::form.control-group>
-                                    @endforeach 
-
+                                    @if(! count($taxRates))
+                                        <div class="flex gap-[20px] items-center py-[10px]">
+                                            <img 
+                                                src="{{ bagisto_asset('images/tax.png') }}" 
+                                                class="w-[80px] h-[80px] border border-dashed border-gray-300 rounded-[4px]"
+                                                    >
+                                            <div class="flex flex-col gap-[6px]">
+                                                <p class="text-[16px] text-gray-400 font-semibold">
+                                                    @lang('admin::app.settings.taxes.tax-categories.create.add-tax-rates')
+                                                </p>
+                                                <p class="text-gray-400"> 
+                                                    @lang('admin::app.settings.taxes.tax-categories.create.empty-text')
+                                                </p>
+                                            </div>
+                                        </div>
+                                    @else
+                                        @foreach ($taxRates as $taxRate)
+                                            <x-admin::form.control-group class="flex gap-[10px] !mb-0 p-[6px]">
+                                                <x-admin::form.control-group.control
+                                                    type="checkbox"
+                                                    name="taxrates[]" 
+                                                    :value="$taxRate->id"
+                                                    :id="'taxrates_' . $taxRate->id"
+                                                    :for="'taxrates_' . $taxRate->id"
+                                                    rules="required"
+                                                    :label="trans('admin::app.settings.taxes.tax-categories.create.tax-rates')"
+                                                    :checked="in_array($taxRate['id'], $selectedOptions)"
+                                                >
+                                                </x-admin::form.control-group.control>
+                                                    
+                                                <x-admin::form.control-group.label 
+                                                    :for="'taxrates_' . $taxRate->id"
+                                                    class="!text-[14px] !text-gray-600 cursor-pointer"
+                                                >
+                                                    {{ $taxRate['identifier'] }}
+                                                </x-admin::form.control-group.label>
+        
+                                            </x-admin::form.control-group>
+                                        @endforeach 
+                                    @endif
+                                    
                                     <x-admin::form.control-group.error
-                                        control-name="taxrates"
+                                        control-name="taxrates[]"
                                     >
                                     </x-admin::form.control-group.error>
-
                                 </div>
                             </x-slot:content>
 
@@ -178,14 +194,20 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
         <script type="module">
             app.component('v-create-tax-category', {
                 template: '#v-create-tax-category-template',
-                
+
                 methods: {
                     store(params, { resetForm, setErrors }) {
                     
-                        this.$axios.post('{{ route('admin.tax_categories.store') }}', params)
+                        this.$axios.post('{{ route('admin.tax_categories.store') }}', params,{
+                            headers: {
+                                'Content-Type': 'multipart/form-data'
+                            }
+                        })
                             .then((response) => {
                                 this.$refs.taxCategory.toggle();
 
+                                this.$root.$refs.taxCategory_data.get();
+                                
                                 this.$emitter.emit('add-flash', { type: 'success', message: response.data.data.message });
 
                                 resetForm();
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
index cd17298f034..3947271c22d 100755
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
@@ -47,7 +47,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                             <div class="mb-[10px]">
                                 <!-- Identifier -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.taxes.tax-rates.create.identifier')
                                     </x-admin::form.control-group.label>
 
@@ -69,7 +69,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
 
                                 <!-- Country -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.taxes.tax-rates.create.country')
                                     </x-admin::form.control-group.label>
                     
@@ -98,7 +98,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                                 <!-- State -->
                                 <template v-if="haveStates()">
                                     <x-admin::form.control-group class="mb-[10px]">
-                                        <x-admin::form.control-group.label>
+                                        <x-admin::form.control-group.label class="required">
                                             @lang('admin::app.settings.taxes.tax-rates.create.state')
                                         </x-admin::form.control-group.label>
                         
@@ -137,7 +137,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
 
                                 <!-- Tax Rate -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.taxes.tax-rates.create.tax_rate')
                                     </x-admin::form.control-group.label>
 
@@ -219,7 +219,7 @@ class="mb-[10px]"
                                 <div v-if="is_zip">
                                     <!-- Zip From -->
                                     <x-admin::form.control-group class="mb-[10px]">
-                                        <x-admin::form.control-group.label>
+                                        <x-admin::form.control-group.label class="required">
                                             @lang('admin::app.settings.taxes.tax-rates.create.zip_from')
                                         </x-admin::form.control-group.label>
 
@@ -241,7 +241,7 @@ class="mb-[10px]"
 
                                     <!-- Zip To -->
                                     <x-admin::form.control-group class="mb-[10px]">
-                                        <x-admin::form.control-group.label>
+                                        <x-admin::form.control-group.label class="required">
                                             @lang('admin::app.settings.taxes.tax-rates.create.zip_to')
                                         </x-admin::form.control-group.label>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
index 4096facc9fe..c64fb4caf10 100755
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
@@ -44,7 +44,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                             <div class="mb-[10px]">
                                 <!-- Identifier -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.taxes.tax-rates.edit.identifier')*
                                     </x-admin::form.control-group.label>
     
@@ -66,7 +66,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
     
                                 <!-- Country -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.taxes.tax-rates.edit.country')
                                     </x-admin::form.control-group.label>
                     
@@ -75,8 +75,8 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                                         name="country"
                                         value="{{ old('country') }}"
                                         rules="required"
-                                        label="{{ trans('admin::app.settings.taxes.tax-rates.edit.country') }}"
-                                        placeholder="{{ trans('admin::app.settings.taxes.tax-rates.edit.country') }}"
+                                        :label="trans('admin::app.settings.taxes.tax-rates.edit.country')"
+                                        :placeholder="trans('admin::app.settings.taxes.tax-rates.edit.country')"
                                         v-model="country"
                                     >
                                         <option value="">
@@ -98,7 +98,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                     
                                 <!-- State -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.taxes.tax-rates.edit.state')
                                     </x-admin::form.control-group.label>
                     
@@ -106,8 +106,8 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                                         type="select"
                                         name="state"
                                         value="{{ old('state') }}"
-                                        label="{{ trans('admin::app.settings.taxes.tax-rates.edit.state') }}"
-                                        placeholder="{{ trans('admin::app.settings.taxes.tax-rates.edit.state') }}"
+                                        :label="trans('admin::app.settings.taxes.tax-rates.edit.state')"
+                                        :placeholder="trans('admin::app.settings.taxes.tax-rates.edit.state')"
                                         v-model="state"
                                     >
                                         <option value="">
@@ -122,7 +122,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
     
                                 <!-- Tax Rate -->
                                 <x-admin::form.control-group class="mb-[10px]">
-                                    <x-admin::form.control-group.label>
+                                    <x-admin::form.control-group.label class="required">
                                         @lang('admin::app.settings.taxes.tax-rates.edit.tax_rate')*
                                     </x-admin::form.control-group.label>
     
@@ -131,8 +131,8 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                                         name="tax_rate"
                                         value="{{ old('tax_rate') ?: $taxRate->tax_rate }}"
                                         rules="required"
-                                        label="{{ trans('admin::app.settings.taxes.tax-rates.edit.tax_rate') }}"
-                                        placeholder="{{ trans('admin::app.settings.taxes.tax-rates.edit.tax_rate') }}"
+                                        :label="trans('admin::app.settings.taxes.tax-rates.edit.tax_rate')"
+                                        :placeholder="trans('admin::app.settings.taxes.tax-rates.edit.tax_rate')"
                                     >
                                     </x-admin::form.control-group.control>
     
@@ -167,7 +167,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
     
                                     <!-- Zip From -->
                                     <x-admin::form.control-group class="mb-[10px]">
-                                        <x-admin::form.control-group.label>
+                                        <x-admin::form.control-group.label class="required">
                                             @lang('admin::app.settings.taxes.tax-rates.edit.zip_from')*
                                         </x-admin::form.control-group.label>
     
@@ -176,8 +176,8 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                                             name="zip_from"
                                             value="{{ old('zip_form') ?: $taxRate->zip_from }}"
                                             rules="required"
-                                            label="{{ trans('admin::app.settings.taxes.tax-rates.edit.zip_from') }}"
-                                            placeholder="{{ trans('admin::app.settings.taxes.tax-rates.edit.zip_from') }}"
+                                            :label="trans('admin::app.settings.taxes.tax-rates.edit.zip_from')"
+                                            :placeholder="trans('admin::app.settings.taxes.tax-rates.edit.zip_from')"
                                         >
                                         </x-admin::form.control-group.control>
     
@@ -190,7 +190,7 @@ class="mt-1"
     
                                     <!-- Zip To -->
                                     <x-admin::form.control-group class="mb-[10px]">
-                                        <x-admin::form.control-group.label>
+                                        <x-admin::form.control-group.label class="required">
                                             @lang('admin::app.settings.taxes.tax-rates.edit.zip_to')*
                                         </x-admin::form.control-group.label>
     
@@ -199,8 +199,8 @@ class="mt-1"
                                             name="zip_to"
                                             value="{{ old('zip_form') ?: $taxRate->zip_to }}"
                                             rules="required"
-                                            label="{{ trans('admin::app.settings.taxes.tax-rates.edit.zip_to') }}"
-                                            placeholder="{{ trans('admin::app.settings.taxes.tax-rates.edit.zip_to') }}"
+                                            :label="trans('admin::app.settings.taxes.tax-rates.edit.zip_to')"
+                                            :placeholder="trans('admin::app.settings.taxes.tax-rates.edit.zip_to')"
                                         >
                                         </x-admin::form.control-group.control>
     
@@ -222,8 +222,8 @@ class="mt-1"
                                             type="text"
                                             name="zip_code"
                                             value="{{ old('zip_code') ?: $taxRate->zip_code }}"
-                                            label="{{ trans('admin::app.settings.taxes.tax-rates.edit.zip_code') }}"
-                                            placeholder="{{ trans('admin::app.settings.taxes.tax-rates.edit.zip_code') }}"
+                                            :label="trans('admin::app.settings.taxes.tax-rates.edit.zip_code')"
+                                            :placeholder="trans('admin::app.settings.taxes.tax-rates.edit.zip_code')"
                                         >
                                         </x-admin::form.control-group.control>
     
diff --git a/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php
index 3af73735786..ce714ad6651 100644
--- a/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php
@@ -30,42 +30,49 @@ class="w-max"
                                     @lang('admin::app.users.sessions.email')
                                 </x-admin::form.control-group.label>
 
-                                <x-admin::form.control-group.control
-                                    type="email"
+                                <x-admin::form.control-group.control 
+                                    type="email" 
                                     name="email" 
                                     id="email"
                                     class="w-[254px] max-w-full" 
                                     rules="required|email" 
                                     :label="trans('admin::app.users.sessions.email')"
                                     :placeholder="trans('admin::app.users.sessions.email')"
-                                >
+                                    >
                                 </x-admin::form.control-group.control>
 
-                                <x-admin::form.control-group.error
+                                <x-admin::form.control-group.error 
                                     control-name="email"
                                 >
                                 </x-admin::form.control-group.error>
                             </x-admin::form.control-group>
                         </div>
-                        <div class="mb-[10px]">
-                            {{-- Password --}}
+
+                        {{-- Password --}}
+                        <div class="relative w-full">
                             <x-admin::form.control-group>
                                 <x-admin::form.control-group.label class="required">
                                     @lang('admin::app.users.sessions.password')
                                 </x-admin::form.control-group.label>
-
-                                <x-admin::form.control-group.control
-                                    type="password"
+                        
+                                <x-admin::form.control-group.control 
+                                    type="password" 
                                     name="password" 
                                     id="password"
-                                    class="w-[254px] max-w-full" 
+                                    class="w-[254px] max-w-full pr-10" 
                                     rules="required|min:6" 
                                     :label="trans('admin::app.users.sessions.password')"
                                     :placeholder="trans('admin::app.users.sessions.password')"
                                 >
                                 </x-admin::form.control-group.control>
-
-                                <x-admin::form.control-group.error
+                        
+                                <span 
+                                    class="icon-view text-[22px] cursor-pointer absolute top-[42px] transform -translate-y-1/2 right-2"
+                                    onclick="switchVisibility()"
+                                >
+                                </span>
+                        
+                                <x-admin::form.control-group.error 
                                     control-name="password"
                                 >
                                 </x-admin::form.control-group.error>
@@ -80,7 +87,7 @@ class="text-[12px] text-blue-600 font-semibold leading-[24px] cursor-pointer"
                         >
                             @lang('admin::app.users.sessions.forget-password-link')
                         </a>
-                        <button 
+                        <button
                             class="px-[14px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-gray-50 font-semibold cursor-pointer">
                             @lang('admin::app.users.sessions.submit-btn')
                         </button>
@@ -89,4 +96,16 @@ class="px-[14px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
             </div>
         </div>
     </div>
+
+    @push('scripts')
+        <script>
+            function switchVisibility() {
+                let passwordField = document.getElementById("password");
+
+                passwordField.type = passwordField.type === "password"
+                    ? "text"
+                    : "password";
+            }
+        </script>
+    @endpush
 </x-admin::layouts.anonymous>
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
index ae9b3deebd8..881630eebc2 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
@@ -39,9 +39,9 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                     </p>
 
                     <div class="mb-[10px]">
-                        <!-- Name -->
+                        {{-- Name --}}
                         <x-admin::form.control-group class="mb-[10px]">
-                            <x-admin::form.control-group.label>
+                            <x-admin::form.control-group.label class="required">
                                 @lang('admin::app.users.users.edit.name')
                             </x-admin::form.control-group.label>
 
@@ -62,9 +62,9 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                             </x-admin::form.control-group.error>
                         </x-admin::form.control-group>
 
-                        <!-- Email -->
+                        {{-- Email --}}
                         <x-admin::form.control-group class="mb-[10px]">
-                            <x-admin::form.control-group.label>
+                            <x-admin::form.control-group.label class="required">
                                 @lang('admin::app.users.users.edit.email')
                             </x-admin::form.control-group.label>
 
@@ -85,9 +85,9 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                             </x-admin::form.control-group.error>
                         </x-admin::form.control-group>
 
-                        <!-- Password -->
+                        {{-- Password --}}
                         <x-admin::form.control-group class="mb-[10px]">
-                            <x-admin::form.control-group.label>
+                            <x-admin::form.control-group.label class="required">
                                 @lang('admin::app.users.users.edit.password')
                             </x-admin::form.control-group.label>
 
@@ -108,9 +108,9 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                             </x-admin::form.control-group.error>
                         </x-admin::form.control-group>
 
-                        <!-- Confirm Password -->
+                        {{-- Confirm Password --}}
                         <x-admin::form.control-group class="mb-[10px]">
-                            <x-admin::form.control-group.label>
+                            <x-admin::form.control-group.label class="required">
                                 @lang('admin::app.users.users.edit.confirm-password')
                             </x-admin::form.control-group.label>
 
@@ -130,9 +130,9 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
                             </x-admin::form.control-group.error>
                         </x-admin::form.control-group>
 
-                        <!-- Role -->
+                        {{-- Role --}}
                         <x-admin::form.control-group class="mb-[10px]">
-                            <x-admin::form.control-group.label>
+                            <x-admin::form.control-group.label class="required">
                                 @lang('admin::app.users.users.edit.role')
                             </x-admin::form.control-group.label>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php
index ed21d833459..ef1f9e6c1cd 100644
--- a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php
@@ -50,7 +50,7 @@ class="text-gray-50 font-semibold px-[12px] py-[6px] bg-blue-600 border border-b
                                 <div class="px-[16px] py-[10px] border-b-[1px] border-gray-300">
                                     <!-- Name -->
                                     <x-admin::form.control-group class="mb-[10px]">
-                                        <x-admin::form.control-group.label>
+                                        <x-admin::form.control-group.label class="required">
                                             @lang('admin::app.users.users.index.create.name')
                                         </x-admin::form.control-group.label>
             
@@ -72,7 +72,7 @@ class="text-gray-50 font-semibold px-[12px] py-[6px] bg-blue-600 border border-b
 
                                     <!-- Email -->
                                     <x-admin::form.control-group class="mb-[10px]">
-                                        <x-admin::form.control-group.label>
+                                        <x-admin::form.control-group.label class="required">
                                             @lang('admin::app.users.users.index.create.email')
                                         </x-admin::form.control-group.label>
             
@@ -94,7 +94,7 @@ class="text-gray-50 font-semibold px-[12px] py-[6px] bg-blue-600 border border-b
 
                                     <!-- Password -->
                                     <x-admin::form.control-group class="mb-[10px]">
-                                        <x-admin::form.control-group.label>
+                                        <x-admin::form.control-group.label class="required">
                                             @lang('admin::app.users.users.index.create.password')
                                         </x-admin::form.control-group.label>
             
@@ -117,7 +117,7 @@ class="text-gray-50 font-semibold px-[12px] py-[6px] bg-blue-600 border border-b
 
                                     <!-- Confirm Password -->
                                     <x-admin::form.control-group class="mb-[10px]">
-                                        <x-admin::form.control-group.label>
+                                        <x-admin::form.control-group.label class="required">
                                             @lang('admin::app.users.users.index.create.confirm-password')
                                         </x-admin::form.control-group.label>
             
@@ -139,7 +139,7 @@ class="text-gray-50 font-semibold px-[12px] py-[6px] bg-blue-600 border border-b
 
                                     <!-- Role -->
                                     <x-admin::form.control-group class="mb-[10px]">
-                                        <x-admin::form.control-group.label>
+                                        <x-admin::form.control-group.label class="required">
                                             @lang('admin::app.users.users.index.create.role')
                                         </x-admin::form.control-group.label>