diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index ff276114..b57f9d9b 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -177,11 +177,12 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   get canSave() {
-    if (!!this.submitted) {
+    const isSubmittable = this.schema.isSubmittable;
+    if (isSubmittable && !!this.submitted) {
       return false;
     }
 
-    if (!!this.cancelled) {
+    if (isSubmittable && !!this.cancelled) {
       return false;
     }
 
@@ -189,10 +190,6 @@ export class Doc extends Observable<DocValue | Doc[]> {
       return false;
     }
 
-    if (this.schema.isSingle) {
-      return false;
-    }
-
     if (this.schema.isChild) {
       return false;
     }
diff --git a/models/baseModels/AccountingSettings/AccountingSettings.ts b/models/baseModels/AccountingSettings/AccountingSettings.ts
index f600d312..20da1baf 100644
--- a/models/baseModels/AccountingSettings/AccountingSettings.ts
+++ b/models/baseModels/AccountingSettings/AccountingSettings.ts
@@ -2,6 +2,7 @@ import { Doc } from 'fyo/model/doc';
 import {
   ChangeArg,
   FiltersMap,
+  HiddenMap,
   ListsMap,
   ReadOnlyMap,
   ValidationMap,
@@ -46,6 +47,11 @@ export class AccountingSettings extends Doc {
     },
   };
 
+  override hidden: HiddenMap = {
+    discountAccount: () => !this.enableDiscounting,
+    gstin: () => this.fyo.singles.SystemSettings?.countryCode !== 'in',
+  };
+
   async change(ch: ChangeArg) {
     const discountingEnabled =
       ch.changed === 'enableDiscounting' && this.enableDiscounting;
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
index 513b41f8..b248476f 100644
--- a/models/baseModels/Item/Item.ts
+++ b/models/baseModels/Item/Item.ts
@@ -11,7 +11,6 @@ import {
   ValidationMap,
 } from 'fyo/model/types';
 import { ValidationError } from 'fyo/utils/errors';
-import { ModelNameEnum } from 'models/types';
 import { Money } from 'pesa';
 import { AccountRootTypeEnum, AccountTypeEnum } from '../Account/types';
 
diff --git a/models/baseModels/PrintSettings/PrintSettings.ts b/models/baseModels/PrintSettings/PrintSettings.ts
new file mode 100644
index 00000000..a8ffea2a
--- /dev/null
+++ b/models/baseModels/PrintSettings/PrintSettings.ts
@@ -0,0 +1,8 @@
+import { Doc } from 'fyo/model/doc';
+import { HiddenMap } from 'fyo/model/types';
+
+export class PrintSettings extends Doc {
+  override hidden: HiddenMap = {
+    displayBatch: () => !this.fyo.singles.InventorySettings?.enableBatches,
+  };
+}
diff --git a/models/index.ts b/models/index.ts
index e8407771..75899c29 100644
--- a/models/index.ts
+++ b/models/index.ts
@@ -10,6 +10,7 @@ import { JournalEntryAccount } from './baseModels/JournalEntryAccount/JournalEnt
 import { Party } from './baseModels/Party/Party';
 import { Payment } from './baseModels/Payment/Payment';
 import { PaymentFor } from './baseModels/PaymentFor/PaymentFor';
+import { PrintSettings } from './baseModels/PrintSettings/PrintSettings';
 import { PurchaseInvoice } from './baseModels/PurchaseInvoice/PurchaseInvoice';
 import { PurchaseInvoiceItem } from './baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem';
 import { SalesInvoice } from './baseModels/SalesInvoice/SalesInvoice';
@@ -17,6 +18,7 @@ import { SalesInvoiceItem } from './baseModels/SalesInvoiceItem/SalesInvoiceItem
 import { SetupWizard } from './baseModels/SetupWizard/SetupWizard';
 import { Tax } from './baseModels/Tax/Tax';
 import { TaxSummary } from './baseModels/TaxSummary/TaxSummary';
+import { Batch } from './inventory/Batch';
 import { InventorySettings } from './inventory/InventorySettings';
 import { Location } from './inventory/Location';
 import { PurchaseReceipt } from './inventory/PurchaseReceipt';
@@ -26,7 +28,6 @@ import { ShipmentItem } from './inventory/ShipmentItem';
 import { StockLedgerEntry } from './inventory/StockLedgerEntry';
 import { StockMovement } from './inventory/StockMovement';
 import { StockMovementItem } from './inventory/StockMovementItem';
-import { Batch } from './inventory/Batch';
 
 export const models = {
   Account,
@@ -41,6 +42,7 @@ export const models = {
   Party,
   Payment,
   PaymentFor,
+  PrintSettings,
   PurchaseInvoice,
   PurchaseInvoiceItem,
   SalesInvoice,
diff --git a/schemas/app/AccountingSettings.json b/schemas/app/AccountingSettings.json
index 69738a59..7bf9cddc 100644
--- a/schemas/app/AccountingSettings.json
+++ b/schemas/app/AccountingSettings.json
@@ -5,87 +5,100 @@
   "isChild": false,
   "isSubmittable": false,
   "fields": [
+    {
+      "label": "Full Name",
+      "fieldname": "fullname",
+      "fieldtype": "Data",
+      "required": true,
+      "section": "Default"
+    },
     {
       "label": "Company Name",
       "fieldname": "companyName",
       "fieldtype": "Data",
       "readOnly": true,
-      "required": true
+      "required": true,
+      "section": "Default"
     },
     {
-      "label": "Write Off Account",
-      "fieldname": "writeOffAccount",
-      "fieldtype": "Link",
-      "target": "Account"
+      "label": "Bank Name",
+      "fieldname": "bankName",
+      "fieldtype": "Data",
+      "readOnly": true,
+      "required": true,
+      "section": "Default"
     },
     {
-      "label": "Round Off Account",
-      "fieldname": "roundOffAccount",
-      "fieldtype": "Link",
-      "target": "Account"
-    },
-    {
-      "fieldname": "country",
       "label": "Country",
+      "fieldname": "country",
       "fieldtype": "AutoComplete",
       "placeholder": "Select Country",
       "readOnly": true,
-      "required": true
-    },
-    {
-      "fieldname": "fullname",
-      "label": "Full Name",
-      "fieldtype": "Data",
-      "required": true
+      "required": true,
+      "section": "Default"
     },
     {
       "fieldname": "email",
       "label": "Email",
       "fieldtype": "Data",
-      "required": true
+      "required": true,
+      "section": "Default"
     },
     {
-      "fieldname": "bankName",
-      "label": "Bank Name",
-      "fieldtype": "Data",
-      "readOnly": true,
-      "required": true
+      "label": "Write Off Account",
+      "fieldname": "writeOffAccount",
+      "fieldtype": "Link",
+      "target": "Account",
+      "section": "Accounts"
     },
     {
-      "fieldname": "fiscalYearStart",
-      "label": "Fiscal Year Start Date",
-      "fieldtype": "Date",
-      "required": true
+      "label": "Round Off Account",
+      "fieldname": "roundOffAccount",
+      "fieldtype": "Link",
+      "target": "Account",
+      "section": "Accounts"
     },
     {
-      "fieldname": "fiscalYearEnd",
-      "label": "Fiscal Year End Date",
-      "fieldtype": "Date",
-      "required": true
+      "label": "Discount Account",
+      "fieldname": "discountAccount",
+      "fieldtype": "Link",
+      "target": "Account",
+      "section": "Accounts"
     },
     {
       "fieldname": "enableDiscounting",
       "label": "Enable Discount Accounting",
       "fieldtype": "Check",
-      "default": false
-    },
-    {
-      "fieldname": "discountAccount",
-      "label": "Discount Account",
-      "fieldtype": "Link",
-      "target": "Account"
+      "default": false,
+      "section": "Feature Flags"
     },
     {
       "fieldname": "enableInventory",
       "label": "Enable Inventory",
       "fieldtype": "Check",
-      "default": false
+      "default": false,
+      "section": "Feature Flags"
+    },
+    {
+      "fieldname": "fiscalYearStart",
+      "label": "Fiscal Year Start Date",
+      "fieldtype": "Date",
+      "required": true,
+      "section": "Fiscal Year"
+    },
+    {
+      "fieldname": "fiscalYearEnd",
+      "label": "Fiscal Year End Date",
+      "fieldtype": "Date",
+      "required": true,
+      "section": "Fiscal Year"
     },
     {
       "fieldname": "setupComplete",
       "label": "Setup Complete",
       "fieldtype": "Check",
-      "default": false
+      "default": false,
+      "hidden": true
     }
   ],
   "quickEditFields": [
diff --git a/schemas/app/Defaults.json b/schemas/app/Defaults.json
index aa91be4e..d68c6c79 100644
--- a/schemas/app/Defaults.json
+++ b/schemas/app/Defaults.json
@@ -9,73 +9,80 @@
       "label": "Sales Invoice Number Series",
       "fieldtype": "Link",
       "target": "NumberSeries",
-      "create": true
+      "create": true,
+      "section": "Number Series"
     },
     {
       "fieldname": "purchaseInvoiceNumberSeries",
       "label": "Purchase Invoice Number Series",
       "fieldtype": "Link",
       "target": "NumberSeries",
-      "create": true
+      "create": true,
+      "section": "Number Series"
     },
     {
       "fieldname": "journalEntryNumberSeries",
       "label": "Journal Entry Number Series",
       "fieldtype": "Link",
       "target": "NumberSeries",
-      "create": true
+      "create": true,
+      "section": "Number Series"
     },
     {
       "fieldname": "paymentNumberSeries",
       "label": "Payment Number Series",
       "fieldtype": "Link",
       "target": "NumberSeries",
-      "create": true
+      "create": true,
+      "section": "Number Series"
     },
     {
       "fieldname": "stockMovementNumberSeries",
       "label": "Stock Movement Number Series",
       "fieldtype": "Link",
       "target": "NumberSeries",
-      "create": true
+      "create": true,
+      "section": "Number Series"
     },
     {
       "fieldname": "shipmentNumberSeries",
       "label": "Shipment Number Series",
       "fieldtype": "Link",
       "target": "NumberSeries",
-      "create": true
+      "create": true,
+      "section": "Number Series"
     },
     {
       "fieldname": "purchaseReceiptNumberSeries",
       "label": "Purchase Receipt Number Series",
       "fieldtype": "Link",
       "target": "NumberSeries",
-      "create": true
+      "create": true,
+      "section": "Number Series"
     },
     {
       "fieldname": "salesInvoiceTerms",
       "label": "Sales Invoice Terms",
       "fieldtype": "Text",
-      "target": "NumberSeries"
+      "section": "Terms"
     },
     {
       "fieldname": "purchaseInvoiceTerms",
       "label": "Purchase Invoice Terms",
       "fieldtype": "Text",
-      "target": "NumberSeries"
+      "section": "Terms"
     },
     {
       "fieldname": "shipmentTerms",
       "label": "Shipment Terms",
       "fieldtype": "Text",
-      "target": "NumberSeries"
+      "section": "Terms"
     },
     {
       "fieldname": "purchaseReceiptTerms",
       "label": "Purchase Receipt Terms",
       "fieldtype": "Text",
-      "target": "NumberSeries"
+      "section": "Terms"
     }
   ]
 }
diff --git a/schemas/app/PrintSettings.json b/schemas/app/PrintSettings.json
index 08f8f16c..cd671c4f 100644
--- a/schemas/app/PrintSettings.json
+++ b/schemas/app/PrintSettings.json
@@ -6,46 +6,36 @@
     {
       "fieldname": "logo",
       "label": "Logo",
-      "fieldtype": "AttachImage"
+      "fieldtype": "AttachImage",
+      "section": "Default"
     },
     {
       "fieldname": "companyName",
       "label": "Company Name",
-      "fieldtype": "Data"
+      "fieldtype": "Data",
+      "section": "Default"
     },
     {
       "fieldname": "email",
       "label": "Email",
       "fieldtype": "Data",
-      "placeholder": "john@doe.com"
-    },
-    {
-      "fieldname": "displayLogo",
-      "label": "Display Logo in Invoice",
-      "fieldtype": "Check"
-    },
-    {
-      "fieldname": "displayTaxInvoice",
-      "label": "Display Tax Invoice",
-      "fieldtype": "Check"
-    },
-    {
-      "fieldname": "displayBatch",
-      "label": "Display Batch",
-      "fieldtype": "Check"
+      "placeholder": "john@doe.com",
+      "section": "Contacts"
     },
     {
       "fieldname": "phone",
       "label": "Phone",
       "fieldtype": "Data",
-      "placeholder": "9888900000"
+      "placeholder": "9888900000",
+      "section": "Contacts"
     },
     {
       "fieldname": "address",
       "label": "Address",
       "fieldtype": "Link",
       "target": "Address",
-      "inline": true
+      "inline": true,
+      "section": "Contacts"
     },
     {
       "fieldname": "template",
@@ -66,7 +56,8 @@
           "label": "Business"
         }
       ],
-      "default": "Basic"
+      "default": "Basic",
+      "section": "Customizations"
     },
     {
       "fieldname": "color",
@@ -115,7 +106,8 @@
           "label": "Black",
           "value": "#112B42"
         }
-      ]
+      ],
+      "section": "Customizations"
     },
     {
       "fieldname": "font",
@@ -136,7 +128,26 @@
           "label": "Courier"
         }
       ],
-      "default": "Arial"
+      "default": "Arial",
+      "section": "Customizations"
+    },
+    {
+      "fieldname": "displayLogo",
+      "label": "Display Logo in Invoice",
+      "fieldtype": "Check",
+      "section": "Customizations"
+    },
+    {
+      "fieldname": "displayTaxInvoice",
+      "label": "Display Tax Invoice",
+      "fieldtype": "Check",
+      "section": "Customizations"
+    },
+    {
+      "fieldname": "displayBatch",
+      "label": "Display Batch",
+      "fieldtype": "Check",
+      "section": "Customizations"
     }
   ],
   "quickEditFields": [
diff --git a/schemas/app/inventory/InventorySettings.json b/schemas/app/inventory/InventorySettings.json
index 0df7e6b4..811db4a4 100644
--- a/schemas/app/inventory/InventorySettings.json
+++ b/schemas/app/inventory/InventorySettings.json
@@ -19,47 +19,55 @@
         }
       ],
       "default": "FIFO",
-      "required": true
+      "required": true,
+      "section": "Default"
     },
     {
       "fieldname": "defaultLocation",
       "label": "Default Location",
       "fieldtype": "Link",
       "target": "Location",
-      "create": true
+      "create": true,
+      "section": "Default"
     },
     {
       "fieldname": "stockInHand",
       "label": "Stock In Hand Acc.",
       "fieldtype": "Link",
-      "target": "Account"
+      "target": "Account",
+      "section": "Accounts"
     },
     {
       "fieldname": "stockReceivedButNotBilled",
       "label": "Stock Received But Not Billed Acc.",
       "fieldtype": "Link",
-      "target": "Account"
+      "target": "Account",
+      "section": "Accounts"
     },
     {
       "fieldname": "costOfGoodsSold",
       "label": "Cost Of Goods Sold Acc.",
       "fieldtype": "Link",
-      "target": "Account"
+      "target": "Account",
+      "section": "Accounts"
     },
     {
       "fieldname": "enableBarcodes",
       "label": "Enable Barcodes",
-      "fieldtype": "Check"
+      "fieldtype": "Check",
+      "section": "Feature Flags"
     },
     {
       "fieldname": "enableBatches",
       "label": "Enable Batches",
-      "fieldtype": "Check"
+      "fieldtype": "Check",
+      "section": "Feature Flags"
     },
     {
       "fieldname": "enableUomConversions",
       "label": "Enable UOM Conversion",
-      "fieldtype": "Check"
+      "fieldtype": "Check",
+      "section": "Feature Flags"
     }
   ]
 }
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index 65bb5759..e597c40f 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -45,7 +45,23 @@
       "default": "MMM d, y",
       "required": true,
       "allowCustom": true,
-      "description": "Sets the app-wide date display format."
+      "description": "Sets the app-wide date display format.",
+      "section": "Default"
+    },
+    {
+      "fieldname": "hideGetStarted",
+      "label": "Hide Get Started",
+      "fieldtype": "Check",
+      "default": false,
+      "description": "Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.",
+      "section": "Default"
+    },
+    {
+      "fieldname": "version",
+      "label": "Version",
+      "fieldtype": "Data",
+      "readOnly": true,
+      "section": "Default"
     },
     {
       "fieldname": "locale",
@@ -54,7 +70,8 @@
       "default": "en-IN",
       "required": true,
       "allowCustom": true,
-      "description": "Set the local code. This is used for number formatting."
+      "description": "Set the local code. This is used for number formatting.",
+      "section": "Number Display"
     },
     {
       "fieldname": "displayPrecision",
@@ -64,29 +81,8 @@
       "required": true,
       "minvalue": 0,
       "maxvalue": 9,
-      "description": "Sets how many digits are shown after the decimal point."
-    },
-    {
-      "fieldname": "internalPrecision",
-      "label": "Internal Precision",
-      "fieldtype": "Int",
-      "minvalue": 0,
-      "default": 11,
-      "description": "Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies."
-    },
-    {
-      "fieldname": "hideGetStarted",
-      "label": "Hide Get Started",
-      "fieldtype": "Check",
-      "default": false,
-      "description": "Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app."
-    },
-    {
-      "fieldname": "countryCode",
-      "label": "Country Code",
-      "fieldtype": "Data",
-      "default": "in",
-      "description": "Country code used to initialize regional settings."
+      "description": "Sets how many digits are shown after the decimal point.",
+      "section": "Number Display"
     },
     {
       "fieldname": "currency",
@@ -94,19 +90,32 @@
       "fieldtype": "AutoComplete",
       "default": "INR",
       "readOnly": true,
-      "required": true
+      "required": true,
+      "section": "Number Display"
     },
     {
-      "fieldname": "version",
-      "label": "Version",
+      "fieldname": "internalPrecision",
+      "label": "Internal Precision",
+      "fieldtype": "Int",
+      "minvalue": 0,
+      "default": 11,
+      "description": "Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.",
+      "hidden": true
+    },
+    {
+      "fieldname": "countryCode",
+      "label": "Country Code",
       "fieldtype": "Data",
-      "readOnly": true
+      "default": "in",
+      "description": "Country code used to initialize regional settings.",
+      "hidden": true
     },
     {
       "fieldname": "instanceId",
       "label": "Instance Id",
       "fieldtype": "Data",
-      "readOnly": true
+      "readOnly": true,
+      "hidden": true
     }
   ],
   "quickEditFields": [
diff --git a/schemas/regional/in/AccountingSettings.json b/schemas/regional/in/AccountingSettings.json
index 66de67ac..e1be3e8e 100644
--- a/schemas/regional/in/AccountingSettings.json
+++ b/schemas/regional/in/AccountingSettings.json
@@ -5,7 +5,8 @@
       "fieldname": "gstin",
       "label": "GSTIN",
       "fieldtype": "Data",
-      "placeholder": "27AAAAA0000A1Z5"
+      "placeholder": "27AAAAA0000A1Z5",
+      "section": "Default"
     }
   ],
   "quickEditFields": [
diff --git a/src/pages/CommonForm/CommonForm.vue b/src/pages/CommonForm/CommonForm.vue
index f40b4e20..124ea130 100644
--- a/src/pages/CommonForm/CommonForm.vue
+++ b/src/pages/CommonForm/CommonForm.vue
@@ -112,6 +112,8 @@ import FormHeader from 'src/components/FormHeader.vue';
 import StatusBadge from 'src/components/StatusBadge.vue';
 import { handleErrorWithDialog } from 'src/errorHandling';
 import { getErrorMessage } from 'src/utils';
+import { docsPathMap } from 'src/utils/misc';
+import { docsPathRef, focusedDocsRef } from 'src/utils/refs';
 import { ActionGroup, UIGroupedFields } from 'src/utils/types';
 import {
   getFieldsGroupedByTabAndSection,
@@ -155,8 +157,17 @@ export default defineComponent({
     }
 
     await this.setDoc();
+    focusedDocsRef.add(this.docOrNull);
     this.updateGroupedFields();
   },
+  activated(): void {
+    docsPathRef.value = docsPathMap[this.schemaName] ?? '';
+    focusedDocsRef.add(this.docOrNull);
+  },
+  deactivated(): void {
+    docsPathRef.value = '';
+    focusedDocsRef.add(this.docOrNull);
+  },
   computed: {
     hasDoc(): boolean {
       return !!this.docOrNull;
diff --git a/src/pages/CommonForm/CommonFormSection.vue b/src/pages/CommonForm/CommonFormSection.vue
index dac5dce2..091f3c39 100644
--- a/src/pages/CommonForm/CommonFormSection.vue
+++ b/src/pages/CommonForm/CommonFormSection.vue
@@ -18,8 +18,10 @@
       <div
         v-for="field of fields"
         :key="field.fieldname"
-        :class="field.fieldtype === 'Table' ? 'col-span-2 text-base' : ''"
-        class="mb-auto"
+        :class="[
+          field.fieldtype === 'Table' ? 'col-span-2 text-base' : '',
+          field.fieldtype === 'Check' ? 'mt-auto' : 'mb-auto',
+        ]"
       >
         <FormControl
           :ref="field.fieldname === 'name' ? 'nameField' : 'fields'"
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index fc71686d..ce463ac9 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -338,7 +338,6 @@ export default {
     LinkedEntryWidget,
     Barcode,
   },
-  inject: ['shortcuts'],
   provide() {
     return {
       schemaName: this.schemaName,
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 9dc1b461..680316ed 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -132,7 +132,6 @@ export default {
     DropdownWithActions,
   },
   emits: ['close'],
-  inject: ['shortcuts'],
   provide() {
     return {
       schemaName: this.schemaName,
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index 0c1d4a4e..d87b04bc 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -1,191 +1,268 @@
 <template>
-  <FormContainer :title="t`Settings`" :searchborder="false">
+  <FormContainer>
+    <template #header>
+      <Button v-if="canSave" type="primary" @click="sync">
+        {{ t`Save` }}
+      </Button>
+    </template>
     <template #body>
-      <!-- Icon Tab Bar -->
-      <div class="flex m-4 mb-0 gap-8">
-        <button
-          v-for="(tab, i) in tabs"
-          :key="tab.label"
-          class="
-            hover:bg-white
-            flex flex-col
-            items-center
-            justify-center
-            cursor-pointer
-            text-sm
-          "
-          :class="
-            i === activeTab &&
-            'text-blue-500 font-semibold border-b-2 border-blue-500'
-          "
-          :style="{
-            paddingBottom: i === activeTab ? 'calc(1rem - 2px)' : '1rem',
-          }"
-          @click="activeTab = i"
-        >
-          {{ tab.label }}
-        </button>
+      <FormHeader
+        :form-title="tabLabels[activeTab] ?? ''"
+        :form-sub-title="t`Settings`"
+        class="sticky top-0 bg-white border-b"
+      >
+      </FormHeader>
+      <!-- Section Container -->
+
+      <div class="overflow-auto custom-scroll" v-if="doc">
+        <CommonFormSection
+          v-for="([name, fields], idx) in activeGroup.entries()"
+          @editrow="(doc: Doc) => toggleQuickEditDoc(doc)"
+          :key="name + idx"
+          ref="section"
+          class="p-4"
+          :class="idx !== 0 && activeGroup.size > 1 ? 'border-t' : ''"
+          :show-title="activeGroup.size > 1 && name !== t`Default`"
+          :title="name"
+          :fields="fields"
+          :doc="doc"
+          :errors="errors"
+          @value-change="onValueChange"
+        />
       </div>
 
-      <!-- Component -->
-      <div class="flex-1 overflow-y-auto custom-scroll">
-        <component
-          :is="tabs[activeTab].component"
-          :schema-name="tabs[activeTab].schemaName"
-          @change="handleChange"
-        />
+      <!-- Tab Bar -->
+      <div
+        class="
+          mt-auto
+          px-4
+          pb-4
+          flex
+          gap-8
+          border-t
+          flex-shrink-0
+          sticky
+          bottom-0
+          bg-white
+        "
+        v-if="groupedFields && groupedFields.size > 1"
+      >
+        <div
+          v-for="key of groupedFields.keys()"
+          :key="key"
+          @click="activeTab = key"
+          class="text-sm cursor-pointer"
+          :class="
+            key === activeTab
+              ? 'text-blue-500 font-semibold border-t-2 border-blue-500'
+              : ''
+          "
+          :style="{
+            paddingTop: key === activeTab ? 'calc(1rem - 2px)' : '1rem',
+          }"
+        >
+          {{ tabLabels[key] }}
+        </div>
       </div>
     </template>
   </FormContainer>
 </template>
-<script>
-import { ipcRenderer } from 'electron';
-import { t } from 'fyo';
+<script lang="ts">
+import { DocValue } from 'fyo/core/types';
+import { Doc } from 'fyo/model/doc';
+import { ValidationError } from 'fyo/utils/errors';
+import { ModelNameEnum } from 'models/types';
+import { Field, Schema } from 'schemas/types';
 import Button from 'src/components/Button.vue';
 import FormContainer from 'src/components/FormContainer.vue';
-import Icon from 'src/components/Icon.vue';
-import PageHeader from 'src/components/PageHeader.vue';
-import Row from 'src/components/Row.vue';
-import StatusBadge from 'src/components/StatusBadge.vue';
-import { fyo } from 'src/initFyo';
+import FormHeader from 'src/components/FormHeader.vue';
+import { handleErrorWithDialog } from 'src/errorHandling';
+import { getErrorMessage } from 'src/utils';
+import { evaluateHidden } from 'src/utils/doc';
+import { reloadWindow } from 'src/utils/ipcCalls';
 import { docsPathMap } from 'src/utils/misc';
 import { docsPathRef } from 'src/utils/refs';
+import { UIGroupedFields } from 'src/utils/types';
 import { showToast } from 'src/utils/ui';
-import { IPC_MESSAGES } from 'utils/messages';
-import { h, markRaw } from 'vue';
-import TabBase from './TabBase.vue';
-import TabGeneral from './TabGeneral.vue';
-import TabInvoice from './TabInvoice.vue';
-import TabSystem from './TabSystem.vue';
-export default {
-  name: 'Settings',
-  components: {
-    PageHeader,
-    StatusBadge,
-    Button,
-    Row,
-    FormContainer,
-  },
-  data() {
-    const hasInventory = !!fyo.singles.AccountingSettings?.enableInventory;
+import { computed, defineComponent, nextTick } from 'vue';
+import CommonFormSection from '../CommonForm/CommonFormSection.vue';
 
+export default defineComponent({
+  components: { FormContainer, Button, FormHeader, CommonFormSection },
+  data() {
     return {
-      activeTab: 0,
-      updated: false,
-      fieldsChanged: [],
-      tabs: [
-        {
-          key: 'Invoice',
-          label: t`Invoice`,
-          schemaName: 'PrintSettings',
-          component: markRaw(TabInvoice),
-        },
-        {
-          key: 'General',
-          label: t`General`,
-          schemaName: 'AccountingSettings',
-          component: markRaw(TabGeneral),
-        },
-        {
-          key: 'Defaults',
-          label: t`Defaults`,
-          schemaName: 'Defaults',
-          component: markRaw(TabBase),
-        },
-        ...(hasInventory
-          ? [
-              {
-                key: 'Inventory',
-                label: t`Inventory`,
-                schemaName: 'InventorySettings',
-                component: markRaw(TabBase),
-              },
-            ]
-          : []),
-        {
-          key: 'System',
-          label: t`System`,
-          schemaName: 'SystemSettings',
-          component: markRaw(TabSystem),
-        },
-      ],
+      errors: {},
+      canSave: false,
+      activeTab: ModelNameEnum.AccountingSettings,
+      groupedFields: null,
+      quickEditDoc: null,
+    } as {
+      errors: Record<string, string>;
+      canSave: boolean;
+      activeTab: string;
+      groupedFields: null | UIGroupedFields;
+      quickEditDoc: null | Doc;
     };
   },
-  activated() {
-    this.setActiveTab();
-    docsPathRef.value = docsPathMap.Settings;
+  provide() {
+    return { doc: computed(() => this.doc) };
   },
-  deactivated() {
+  mounted() {
+    if (this.fyo.store.isDevelopment) {
+      // @ts-ignore
+      window.settings = this;
+    }
+
+    this.update();
+  },
+  activated(): void {
+    docsPathRef.value = docsPathMap.Settings ?? '';
+  },
+  deactivated(): void {
     docsPathRef.value = '';
-    if (this.fieldsChanged.length === 0) {
-      return;
-    }
-
-    const shouleShowReload = this.fieldsChanged
-      .map(({ fieldname }) => fieldname)
-      .some((f) => {
-        if (f.startsWith('enable')) {
-          return true;
-        }
-
-        if (f === 'displayPrecision') {
-          return true;
-        }
-
-        if (f === 'hideGetStarted') {
-          return true;
-        }
-
-        return false;
-      });
-
-    if (shouleShowReload) {
-      this.showReloadToast();
-    }
   },
   methods: {
-    showReloadToast() {
-      showToast({
-        message: t`Settings changes will be visible on reload`,
-        actionText: t`Reload App`,
-        type: 'info',
-        action: async () => {
-          ipcRenderer.send(IPC_MESSAGES.RELOAD_MAIN_WINDOW);
-        },
-      });
-    },
-    handleChange(df, newValue, oldValue) {
-      if (!df) {
-        return;
+    async sync(): Promise<void> {
+      const syncableDocs = this.schemas
+        .map(({ name }) => this.fyo.singles[name])
+        .filter((doc) => doc?.canSave) as Doc[];
+
+      for (const doc of syncableDocs) {
+        await this.syncDoc(doc);
       }
 
-      this.fieldsChanged.push(df);
+      this.update();
+      await showToast({
+        message: this.t`Changes will be visible on reload`,
+        actionText: this.t`Reload App`,
+        type: 'info',
+        action: reloadWindow,
+      });
     },
-    setActiveTab() {
-      const { tab } = this.$route.query;
-      const index = this.tabs.findIndex((i) => i.key === tab);
-      if (index !== -1) {
-        this.activeTab = index;
-      } else {
-        this.activeTab = 0;
+    async syncDoc(doc: Doc): Promise<void> {
+      try {
+        await doc.sync();
+        this.updateGroupedFields();
+      } catch (err) {
+        if (!(err instanceof Error)) {
+          return;
+        }
+
+        await handleErrorWithDialog(err, doc);
       }
     },
-    getIconComponent(tab) {
-      return {
-        render() {
-          return h(Icon, {
-            class: 'w-6 h-6',
-            ...Object.assign(
-              {
-                name: tab.icon,
-                size: '24',
-              },
-              this.$attrs
-            ),
-          });
-        },
-      };
+    async toggleQuickEditDoc(doc: Doc | null): Promise<void> {
+      if (this.quickEditDoc && doc) {
+        this.quickEditDoc = null;
+        await nextTick();
+      }
+
+      this.quickEditDoc = doc;
+    },
+    async onValueChange(field: Field, value: DocValue): Promise<void> {
+      const { fieldname } = field;
+      delete this.errors[fieldname];
+
+      try {
+        await this.doc?.set(fieldname, value);
+      } catch (err) {
+        if (!(err instanceof Error)) {
+          return;
+        }
+
+        this.errors[fieldname] = getErrorMessage(err, this.doc ?? undefined);
+      }
+
+      this.update();
+    },
+    update(): void {
+      this.updateCanSave();
+      this.updateGroupedFields();
+    },
+    updateCanSave(): void {
+      this.canSave = this.schemas
+        .map(({ name }) => this.fyo.singles[name]?.canSave)
+        .some(Boolean);
+    },
+    updateGroupedFields(): void {
+      const grouped: UIGroupedFields = new Map();
+      const fields: Field[] = this.schemas.map((s) => s.fields).flat();
+
+      for (const field of fields) {
+        const schemaName = field.schemaName!;
+        if (!grouped.has(schemaName)) {
+          grouped.set(schemaName, new Map());
+        }
+
+        const tabbed = grouped.get(schemaName)!;
+        const section = field.section ?? this.t`Miscellaneous`;
+        if (!tabbed.has(section)) {
+          tabbed.set(section, []);
+        }
+
+        if (field.meta) {
+          continue;
+        }
+
+        const doc = this.fyo.singles[schemaName];
+        if (evaluateHidden(field, doc)) {
+          continue;
+        }
+
+        tabbed.get(section)!.push(field);
+      }
+
+      this.groupedFields = grouped;
     },
   },
-};
+  computed: {
+    doc(): Doc | null {
+      const doc = this.fyo.singles[this.activeTab];
+      if (!doc) {
+        return null;
+      }
+
+      return doc;
+    },
+    tabLabels(): Record<string, string> {
+      return {
+        [ModelNameEnum.AccountingSettings]: this.t`General`,
+        [ModelNameEnum.PrintSettings]: this.t`Print`,
+        [ModelNameEnum.InventorySettings]: this.t`Inventory`,
+        [ModelNameEnum.Defaults]: this.t`Defaults`,
+        [ModelNameEnum.SystemSettings]: this.t`System`,
+      };
+    },
+    schemas(): Schema[] {
+      const enableInventory =
+        !!this.fyo.singles.AccountingSettings?.enableInventory;
+
+      return [
+        ModelNameEnum.AccountingSettings,
+        ModelNameEnum.InventorySettings,
+        ModelNameEnum.Defaults,
+        ModelNameEnum.PrintSettings,
+        ModelNameEnum.SystemSettings,
+      ]
+        .filter((s) =>
+          s === ModelNameEnum.InventorySettings ? enableInventory : true
+        )
+        .map((s) => this.fyo.schemaMap[s]!);
+    },
+    activeGroup(): Map<string, Field[]> {
+      if (!this.groupedFields) {
+        return new Map();
+      }
+
+      const group = this.groupedFields.get(this.activeTab);
+      if (!group) {
+        throw new ValidationError(
+          `Tab group ${this.activeTab} has no value set`
+        );
+      }
+
+      return group;
+    },
+  },
+});
 </script>
diff --git a/src/pages/Settings/TabBase.vue b/src/pages/Settings/TabBase.vue
deleted file mode 100644
index ae402618..00000000
--- a/src/pages/Settings/TabBase.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-  <div>
-    <TwoColumnForm
-      v-if="doc"
-      :doc="doc"
-      :fields="fields"
-      :autosave="true"
-      :emit-change="true"
-      @change="(...args:unknown[])=>$emit('change', ...args)"
-    />
-  </div>
-</template>
-<script lang="ts">
-import { Doc } from 'fyo/model/doc';
-import TwoColumnForm from 'src/components/TwoColumnForm.vue';
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-  name: 'TabGeneral',
-  emits: ['change'],
-  props: { schemaName: String },
-  components: {
-    TwoColumnForm,
-  },
-  async mounted() {
-    await this.setDoc();
-  },
-  watch: {
-    async schemaName() {
-      await this.setDoc();
-    },
-  },
-  methods: {
-    async setDoc() {
-      if (this.doc && this.schemaName === this.doc.schemaName) {
-        return;
-      }
-
-      if (!this.schemaName) {
-        return;
-      }
-
-      this.doc = await this.fyo.doc.getDoc(this.schemaName, this.schemaName, {
-        skipDocumentCache: true,
-      });
-    },
-  },
-  data() {
-    return {
-      doc: undefined,
-    } as { doc?: Doc };
-  },
-  computed: {
-    fields() {
-      return this.doc?.schema.fields;
-    },
-  },
-});
-</script>
diff --git a/src/pages/Settings/TabGeneral.vue b/src/pages/Settings/TabGeneral.vue
deleted file mode 100644
index 2061393d..00000000
--- a/src/pages/Settings/TabGeneral.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<script lang="ts">
-import { Field } from 'schemas/types';
-import { fyo } from 'src/initFyo';
-import { defineComponent } from 'vue';
-import TabBase from './TabBase.vue';
-
-export default defineComponent({
-  extends: TabBase,
-  name: 'TabGeneral',
-  async mounted() {
-    this.doc = await fyo.doc.getDoc(
-      'AccountingSettings',
-      'AccountingSettings',
-      {
-        skipDocumentCache: true,
-      }
-    );
-  },
-  computed: {
-    fields() {
-      const fields = [
-        'fullname',
-        'companyName',
-        'country',
-        'bankName',
-        'currency',
-        'fiscalYearStart',
-        'fiscalYearEnd',
-        'writeOffAccount',
-        'roundOffAccount',
-        'enableDiscounting',
-        'enableInventory',
-      ];
-
-      if (this.doc?.enableDiscounting) {
-        fields.push('discountAccount');
-      }
-
-      if (fyo.singles.SystemSettings?.countryCode === 'in') {
-        fields.push('gstin');
-      }
-
-      return fields
-        .map((fieldname) => fyo.getField('AccountingSettings', fieldname))
-        .filter(Boolean) as Field[];
-    },
-  },
-});
-</script>
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
deleted file mode 100644
index 2dde33e6..00000000
--- a/src/pages/Settings/TabInvoice.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<template>
-  <div v-if="doc" class="pb-4">
-    <hr />
-    <div class="flex items-center gap-4 p-4">
-      <FormControl
-        :df="getField('logo')"
-        :value="doc.logo"
-        @change="
-          (value) => {
-            doc.setAndSync('logo', value);
-            forwardChangeEvent(getField('logo'));
-          }
-        "
-      />
-      <div class="flex flex-col">
-        <span
-          class="bg-transparent font-semibold text-xl text-gray-900 px-3 py-2"
-        >
-          {{ companyName }}
-        </span>
-        <span class="text-lg text-gray-800 px-3 py-2">
-          {{ doc.email }}
-        </span>
-      </div>
-    </div>
-    <TwoColumnForm
-      :doc="doc"
-      :fields="fields"
-      :autosave="true"
-      :emit-change="true"
-      @change="forwardChangeEvent"
-    />
-  </div>
-</template>
-<script>
-import { ipcRenderer } from 'electron';
-import TwoColumnForm from 'src/components/TwoColumnForm.vue';
-import { fyo } from 'src/initFyo';
-import { IPC_ACTIONS } from 'utils/messages';
-import FormControl from '../../components/Controls/FormControl.vue';
-
-export default {
-  name: 'TabInvoice',
-  components: {
-    TwoColumnForm,
-    FormControl,
-  },
-  emits: ['change'],
-  provide() {
-    return {
-      schemaName: 'PrintSettings',
-      name: 'PrintSettings',
-    };
-  },
-  data() {
-    return {
-      companyName: null,
-      doc: null,
-      showEdit: false,
-    };
-  },
-  async mounted() {
-    this.doc = await fyo.doc.getDoc('PrintSettings');
-    this.companyName = (await fyo.doc.getDoc('AccountingSettings')).companyName;
-  },
-  computed: {
-    fields() {
-      const fields = ['template', 'color', 'font', 'email', 'phone', 'address'];
-
-      if (this.doc.logo) {
-        fields.unshift('displayLogo');
-      }
-
-      return fields.map((field) => this.getField(field));
-    },
-  },
-  methods: {
-    getField(fieldname) {
-      return fyo.getField('PrintSettings', fieldname);
-    },
-    async openFileSelector() {
-      const options = {
-        title: t`Select Logo`,
-        properties: ['openFile'],
-        filters: [{ name: 'Invoice Logo', extensions: ['png', 'jpg', 'svg'] }],
-      };
-      const { filePaths } = await ipcRenderer.invoke(
-        IPC_ACTIONS.GET_OPEN_FILEPATH,
-        options
-      );
-      if (filePaths[0] !== undefined) {
-        this.doc.set('logo', `file://${files[0]}`);
-        this.doc.update;
-      }
-    },
-    forwardChangeEvent(...args) {
-      this.$emit('change', ...args);
-    },
-  },
-};
-</script>
diff --git a/src/pages/Settings/TabSystem.vue b/src/pages/Settings/TabSystem.vue
deleted file mode 100644
index dd87f92f..00000000
--- a/src/pages/Settings/TabSystem.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div class="flex flex-col justify-between h-full">
-    <TwoColumnForm
-      v-if="doc"
-      :doc="doc"
-      :fields="fields"
-      :autosave="true"
-      :emit-change="true"
-      @change="forwardChangeEvent"
-    />
-    <div class="flex p-4 justify-between">
-      <LanguageSelector class="text-sm w-28" />
-      <p class="mt-auto text-gray-600 text-base select-none">
-        {{ `v${fyo.store.appVersion}` }}
-      </p>
-    </div>
-  </div>
-</template>
-
-<script>
-import { ConfigKeys } from 'fyo/core/types';
-import { ModelNameEnum } from 'models/types';
-import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
-import TwoColumnForm from 'src/components/TwoColumnForm';
-import { fyo } from 'src/initFyo';
-
-export default {
-  name: 'TabSystem',
-  components: {
-    TwoColumnForm,
-    LanguageSelector,
-  },
-  emits: ['change'],
-  data() {
-    return {
-      doc: null,
-      telemetry: '',
-    };
-  },
-  async mounted() {
-    this.doc = fyo.singles.SystemSettings;
-    this.companyName = fyo.singles.AccountingSettings.companyName;
-    this.telemetry = fyo.config.get(ConfigKeys.Telemetry);
-  },
-  computed: {
-    fields() {
-      return fyo.schemaMap.SystemSettings.quickEditFields.map((f) =>
-        fyo.getField(ModelNameEnum.SystemSettings, f)
-      );
-    },
-  },
-  methods: {
-    forwardChangeEvent(...args) {
-      this.$emit('change', ...args);
-    },
-  },
-};
-</script>
diff --git a/src/utils/ipcCalls.ts b/src/utils/ipcCalls.ts
index 7e3477af..3049c82d 100644
--- a/src/utils/ipcCalls.ts
+++ b/src/utils/ipcCalls.ts
@@ -10,6 +10,10 @@ import { SelectFileOptions, SelectFileReturn } from 'utils/types';
 import { setLanguageMap } from './language';
 import { showMessageDialog, showToast } from './ui';
 
+export function reloadWindow() {
+  return ipcRenderer.send(IPC_MESSAGES.RELOAD_MAIN_WINDOW);
+}
+
 export async function selectFile(
   options: SelectFileOptions
 ): Promise<SelectFileReturn> {
diff --git a/src/utils/language.ts b/src/utils/language.ts
index 901a0a88..4b61272a 100644
--- a/src/utils/language.ts
+++ b/src/utils/language.ts
@@ -2,7 +2,8 @@ import { ipcRenderer } from 'electron';
 import { DEFAULT_LANGUAGE } from 'fyo/utils/consts';
 import { setLanguageMapOnTranslationString } from 'fyo/utils/translation';
 import { fyo } from 'src/initFyo';
-import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
+import { IPC_ACTIONS } from 'utils/messages';
+import { reloadWindow } from './ipcCalls';
 import { systemLanguageRef } from './refs';
 import { showToast } from './ui';
 
@@ -47,7 +48,7 @@ export async function setLanguageMap(
   }
 
   if (!dontReload && success && initLanguage !== oldLanguage) {
-    await ipcRenderer.send(IPC_MESSAGES.RELOAD_MAIN_WINDOW);
+    reloadWindow();
   }
   return success;
 }