diff --git a/resources/assets/js/components/AkauntingModal.vue b/resources/assets/js/components/AkauntingModal.vue
index 5dc8d4c7c..2a20e0f1e 100644
--- a/resources/assets/js/components/AkauntingModal.vue
+++ b/resources/assets/js/components/AkauntingModal.vue
@@ -7,7 +7,7 @@
             tabindex="-1"
             role="dialog"
             :aria-hidden="!show">
-            <div class="w-full my-10 m-auto flex flex-col" :class="modalDialogClass ? modalDialogClass : 'max-w-screen-sm'">
+            <div class="w-full my-10 m-auto flex flex-col" :class="modalDialogClass ? modalDialogClass : 'max-w-md'">
                 <slot name="modal-content">
                     <div class="modal-content">
                         <div class="p-5 bg-body rounded-tl-lg rounded-tr-lg">
diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue
index 3fc07e890..4d9c35627 100644
--- a/resources/assets/js/components/AkauntingModalAddNew.vue
+++ b/resources/assets/js/components/AkauntingModalAddNew.vue
@@ -7,7 +7,7 @@
             tabindex="-1"
             role="dialog"
             :aria-hidden="!show">
-            <div class="w-full my-10 m-auto flex flex-col" :class="modalDialogClass ? modalDialogClass : 'max-w-screen-sm'">
+            <div class="w-full my-10 m-auto flex flex-col" :class="modalDialogClass ? modalDialogClass : 'max-w-md'">
                 <slot name="modal-content">
                     <div class="modal-content">
                         <div class="p-5 bg-body rounded-tl-lg rounded-tr-lg">
diff --git a/resources/assets/js/views/banking/transactions.js b/resources/assets/js/views/banking/transactions.js
index b68954255..6cc9348f9 100644
--- a/resources/assets/js/views/banking/transactions.js
+++ b/resources/assets/js/views/banking/transactions.js
@@ -52,7 +52,7 @@ const app = new Vue({
 
                 this.component = Vue.component('add-new-component', (resolve, reject) => {
                     resolve({
-                        template: '<div id="dynamic-email-component"><akaunting-modal-add-new modal-dialog-class="max-w-screen-md" :show="email.modal" @submit="onSubmit" @cancel="onCancel" :buttons="email.buttons" :title="email.title" :is_component=true :message="email.html"></akaunting-modal-add-new></div>',
+                        template: '<div id="dynamic-email-component"><akaunting-modal-add-new modal-dialog-class="max-w-md" :show="email.modal" @submit="onSubmit" @cancel="onCancel" :buttons="email.buttons" :title="email.title" :is_component=true :message="email.html"></akaunting-modal-add-new></div>',
 
                         mixins: [
                             Global
diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index 26fe67ac2..32c721cc4 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -856,7 +856,7 @@ const app = new Vue({
 
                 this.component = Vue.component('add-new-component', (resolve, reject) => {
                     resolve({
-                        template: '<div id="dynamic-email-component"><akaunting-modal-add-new modal-dialog-class="max-w-screen-md" :show="email.modal" @submit="onSubmit" @cancel="onCancel" :buttons="email.buttons" :title="email.title" :is_component=true :message="email.html"></akaunting-modal-add-new></div>',
+                        template: '<div id="dynamic-email-component"><akaunting-modal-add-new modal-dialog-class="max-w-md" :show="email.modal" @submit="onSubmit" @cancel="onCancel" :buttons="email.buttons" :title="email.title" :is_component=true :message="email.html"></akaunting-modal-add-new></div>',
 
                         mixins: [
                             Global
diff --git a/resources/views/modals/companies/edit.blade.php b/resources/views/modals/companies/edit.blade.php
index 967cee3c6..7d787469d 100644
--- a/resources/views/modals/companies/edit.blade.php
+++ b/resources/views/modals/companies/edit.blade.php
@@ -1,17 +1,17 @@
 <x-form id="setting" method="PATCH" route="settings.company.update">
     <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5d">
-        <x-form.group.text name="name" label="{{ trans('settings.company.name') }}" value="{{ setting('company.name') }}" />
+        <x-form.group.text name="name" label="{{ trans('settings.company.name') }}" value="{{ setting('company.name') }}" form-group-class="col-span-6" />
 
-        <x-form.group.text name="email" label="{{ trans('settings.company.email') }}" value="{{ setting('company.email') }}" />
+        <x-form.group.text name="email" label="{{ trans('settings.company.email') }}" value="{{ setting('company.email') }}" form-group-class="col-span-6" />
 
-        <x-form.group.text name="tax_number" label="{{ trans('general.tax_number') }}" value="{{ setting('company.tax_number') }}" not-required />
+        <x-form.group.text name="tax_number" label="{{ trans('general.tax_number') }}" value="{{ setting('company.tax_number') }}" form-group-class="col-span-6" not-required />
 
-        <x-form.group.text name="phone" label="{{ trans('settings.company.phone') }}" value="{{ setting('company.phone') }}" not-required />
+        <x-form.group.text name="phone" label="{{ trans('settings.company.phone') }}" value="{{ setting('company.phone') }}" form-group-class="col-span-6" not-required />
 
-        <x-form.group.textarea name="address" label="{{ trans('settings.company.address') }}" :value="setting('company.address')" />
+        <x-form.group.textarea name="address" label="{{ trans('settings.company.address') }}" :value="setting('company.address')" form-group-class="col-span-6" />
 
-        <x-form.group.country />
+        <x-form.group.country form-group-class="col-span-6" />
 
-        <x-form.input.hidden name="_prefix" value="company" />
+        <x-form.input.hidden name="_prefix" value="company" form-group-class="col-span-6" />
     </div>
 </x-form>