diff --git a/api/src/models/branch.model.js b/api/src/models/branch.model.js
index e783dfcf7..dd0c46e19 100644
--- a/api/src/models/branch.model.js
+++ b/api/src/models/branch.model.js
@@ -1136,6 +1136,7 @@ class BranchModel {
         country: data.country,
         country_id: data.country_id,
         state: data.state,
+        city: typeof data.city === 'string' ? data.city.trim().slice(0, 50) : '',
         store_address: data.address?.trim(),
         store_email: data.email?.trim(),
         store_telephone: data.phone?.trim(),
@@ -1575,6 +1576,7 @@ class BranchModel {
         country: data.country,
         country_id: data.country_id,
         state: data.state,
+        ...(typeof data.city === 'string' ? { city: data.city.trim().slice(0, 50) } : {}),
         store_address: data.address?.trim(),
         store_email: data.email?.trim(),
         store_telephone: data.phone?.trim(),
diff --git a/api/tests/unit/models/branch.model.test.js b/api/tests/unit/models/branch.model.test.js
index 1ad863a6e..c4499772e 100644
--- a/api/tests/unit/models/branch.model.test.js
+++ b/api/tests/unit/models/branch.model.test.js
@@ -944,6 +944,7 @@ describe('BranchModel.createBranch', () => {
     name: 'New Branch',
     country: 'IN',
     state: 'KL',
+    city: '  Kochi  ',
     email: 'test@test.com',
     phone: '9999999999',
     register: ['Main Register'],
@@ -978,6 +979,7 @@ describe('BranchModel.createBranch', () => {
     const r = await bm.createBranch(data, user);
     expect(r.status).toBe(true);
     expect(r.data.insertId).toBe(branchId.toString());
+    expect(mockModel.create.mock.calls[0][0].city).toBe('Kochi');
   });
 
   test('returns branchList array on success', async () => {
@@ -1067,6 +1069,13 @@ describe('BranchModel.updateBranch', () => {
     const spy = jest.spyOn(bm, 'updateBranchNameInCollections').mockResolvedValue();
     await bm.updateBranch(id.toString(), data, user);
     expect(spy).toHaveBeenCalledTimes(1);
+    expect(mockModel.findOneAndUpdate.mock.calls[0][1].$set).not.toHaveProperty('city');
+  });
+
+  test('saves a supplied city without changing legacy requests that omit it', async () => {
+    mockModel.findOneAndUpdate.mockReturnValue({ lean: jest.fn().mockResolvedValue(null) });
+    await bm.updateBranch(validId(), { ...data, city: '  Kochi  ' }, user);
+    expect(mockModel.findOneAndUpdate.mock.calls[0][1].$set.city).toBe('Kochi');
   });
 
   test('an existing register keeps its register_id across edits; new names get new ids', async () => {
diff --git a/docs/ORGANIZED_RECORD_FORMS.md b/docs/ORGANIZED_RECORD_FORMS.md
new file mode 100644
index 000000000..cb61f678b
--- /dev/null
+++ b/docs/ORGANIZED_RECORD_FORMS.md
@@ -0,0 +1,22 @@
+# Organized record forms
+
+The record editor keeps existing input IDs, names, validation, permission controls and save handlers. Customer, supplier, category, user and new-branch editors use a centered 820px dialog on desktop and a full-width sheet on phones. Header and actions remain visible while scrolling. User access and branch setup have separate sections; all sections are revealed before validation so required inputs cannot be skipped. Category shapes are labelled buttons with actual shapes and pressed state.
+
+Sales preferences are grouped into Checkout, Product search, Receipts & sharing and Controls. The existing Core Settings save operation still owns their values. Hardware configuration remains in the app; independent recovery windows remain available through Electron. The floating Desktop menu is removed. Mobile devices retain `settings/devices`; desktop hardware uses `settings/hardware`, eliminating duplicate pane and navigation IDs.
+
+New customers, suppliers and branches start with the current shop's country, state and city. Edits keep the record's saved location. A manually changed country clears the state selection until the user chooses one; an older state-list response cannot overwrite a newer request. A missing shop state is left blank instead of guessing the first state. Branch creation and the legacy branch editor now persist the existing `branches.city` field; requests that omit city preserve the saved value.
+
+## Data and synchronization
+
+- No new collections, permission grants, print modes or payment writes are introduced.
+- `customers`, `suppliers` and `categories` retain their existing branch-scoped lanes in POS `api/src/sync/collections.json`, Gateway `apps/sync-gateway/src/collections.js` and agent `apps/sync-agent/sync-config.json`.
+- `branches.city` already belongs to the whole branch document. The three manifests already include `branches` as global within the licensed installation, with Gateway access filtering. No new transport or migration is needed. This change supplies the field during creation and legacy editing, without changing its replication.
+- Existing IDs, timestamps, conflict resolution, tombstones and uploaded-file paths are unchanged. New form grouping does not change serialization or upload handlers. User access and credentials retain their existing authority and are not newly replicated.
+- `city_setting` is a local cache of the active shop response, refreshed alongside country and state; the branch document remains authoritative. Draft forms stay local until the existing Save action is used.
+- Expected delivery is unchanged: a saved business record reaches cloud and authorized tills through its existing lane, including queued changes after reconnect. Live multi-device create/update/delete and reconnect delivery were not exercised in this change; matching manifests are not proof of delivery.
+
+## Release
+
+Ship the API city persistence change and frontend assets together. Electron menu organization needs the next desktop installer; the web form layout does not. Preserve independent recovery windows. Do not publish the desktop latest channel before the requested private installer test.
+
+Local verification includes actual-template DOM regression tests for control ownership and values, tab validation, state-selection races, existing phone/permission/settings tests, API branch creation, translation coverage, frontend build, and isolated Electron-rendered layout previews. These previews do not save live shop records.
diff --git a/frontend/dashboard.html b/frontend/dashboard.html
index 674343d83..37c5543f7 100644
--- a/frontend/dashboard.html
+++ b/frontend/dashboard.html
@@ -1012,159 +1012,7 @@ <h6><span> <lang class="lang_do_you_want_remove_this_image">Do you want remove t
                                         }
                                     });
             </script>
-        <script>
-            // Desktop tools quick-access (Electron only). Same actions as the
-            // File menu and tray - this is the discoverable, in-app door.
-            (function () {
-                if (!window.electronAPI || !window.electronAPI.desktop) return;
-                const style = document.createElement('style');
-                // Colors ride the app's theme variables (Config -> Appearance)
-                // with brand-blue fallbacks for pages without a theme.
-                style.textContent =
-                    '#posnic-desktop-fab{position:fixed;bottom:18px;right:18px;z-index:99990;font-family:inherit}' +
-                    '#posnic-desktop-fab .fab-btn{background:var(--theme-card-bg,#fff);' +
-                    'color:var(--theme-text-primary,#16203a);border:1px solid var(--theme-border-color,#d5dfed);border-radius:8px;' +
-                    'height:46px;min-width:46px;padding:0 14px;display:flex;align-items:center;justify-content:center;' +
-                    'font-size:13px;font-weight:600;cursor:pointer;box-shadow:0 2px 8px rgba(0,0,0,.10)}' +
-                    '#posnic-desktop-fab .fab-label{white-space:nowrap;margin-inline-start:8px}' +
-                    '#posnic-desktop-fab button:focus-visible{outline:2px solid var(--theme-primary-color,#506fe4);outline-offset:-3px}' +
-                    '#posnic-desktop-fab .fab-menu{display:none;position:absolute;bottom:48px;right:0;' +
-                    'background:var(--theme-card-bg,#fff);border:1px solid var(--theme-border-color,#e6e6e6);' +
-                    'border-radius:8px;box-shadow:0 8px 24px rgba(0,0,0,.12);padding:6px;min-width:250px;max-width:calc(100vw - 36px);max-height:calc(100vh - 90px);overflow:auto}' +
-                    '#posnic-desktop-fab.open .fab-menu{display:block}' +
-                    '#posnic-desktop-fab .fab-menu button{display:flex;gap:12px;align-items:center;width:100%;text-align:start;background:none;' +
-                    'border:none;border-radius:5px;padding:10px 12px;font:inherit;font-size:13px;color:var(--theme-text-primary,#16203a);cursor:pointer}' +
-                    '#posnic-desktop-fab .fab-menu button:hover{background:var(--theme-menu-active-bg,#f0f2ff);' +
-                    'color:var(--theme-menu-active-text,inherit)}';
-                document.head.appendChild(style);
-
-                const fab = document.createElement('div');
-                fab.id = 'posnic-desktop-fab';
-                fab.innerHTML = '<div class="fab-menu" id="posnic-desktop-menu" role="menu"></div><button type="button" class="fab-btn" aria-haspopup="menu" aria-expanded="false" aria-controls="posnic-desktop-menu" title="Desktop tools" data-t-title="lang_desktop_tools"><i class="feather icon-monitor" aria-hidden="true"></i><span class="fab-label"><lang class="lang_desktop">Desktop</lang></span><span id="posnic-sync-dot"></span></button>';
-                document.body.appendChild(fab);
-
-                const dotStyle = document.createElement('style');
-                dotStyle.textContent =
-                    '#posnic-sync-dot{display:none;width:9px;height:9px;border-radius:50%;margin-left:8px;' +
-                    'vertical-align:middle;display:inline-block}' +
-                    '#posnic-sync-dot.on{background:#4ade80;box-shadow:0 0 5px #4ade80}' +
-                    '#posnic-sync-dot.off{background:#f87171;box-shadow:0 0 5px #f87171}' +
-                    '#posnic-sync-dot.none{display:none}';
-                document.head.appendChild(dotStyle);
-
-                // Live cloud sync indicator on the button (only when activated)
-                const syncDot = fab.querySelector('#posnic-sync-dot');
-                const refreshSyncDot = async () => {
-                    try {
-                        const status = await window.electronAPI.cloud.status();
-                        if (!status.connected) { syncDot.className = 'none'; return; }
-                        syncDot.className = status.sync && status.sync.online ? 'on' : 'off';
-                    } catch (e) { syncDot.className = 'none'; }
-                };
-                refreshSyncDot();
-                setInterval(refreshSyncDot, 30000);
-
-                const menu = fab.querySelector('.fab-menu');
-                const trigger = fab.querySelector('.fab-btn');
-                const closeMenu = () => { fab.classList.remove('open'); trigger.setAttribute('aria-expanded', 'false'); };
-                const updateDesktopToolVisibility = () => {
-                    const working = /^#\/(?:kot(?:_v2)?(?:\/|$)|sales\/(?:new(?:\/|$)|[^/]+\/(?:edit|hold)(?:\/|$)))/.test(location.hash);
-                    fab.hidden = working;
-                    if (working) closeMenu();
-                };
-                window.addEventListener('hashchange', updateDesktopToolVisibility);
-                updateDesktopToolVisibility();
-                const addItem = (label, target, icon, settings) => {
-                    const b = document.createElement('button');
-                    b.type = 'button'; b.setAttribute('role', 'menuitem');
-                    const glyph = document.createElement('i'); glyph.className = 'feather icon-' + icon; glyph.setAttribute('aria-hidden', 'true');
-                    b.appendChild(glyph); b.appendChild(document.createTextNode(label));
-                    b.addEventListener('click', async () => {
-                        closeMenu();
-                        if (settings) hasher.setHash('settings/' + target);
-                        else {
-                            try {
-                                const opened = await window.electronAPI.desktop.open(target);
-                                if (opened === false || (opened && opened.ok === false)) throw new Error('Desktop action unavailable');
-                            } catch (error) {
-                                console.error('[Desktop tools] Could not open ' + target, error);
-                                PosnicPro.alert('error', PosnicPro.i18n.t('lang_request_failed', 'Request failed'));
-                            }
-                        }
-                    });
-                    menu.appendChild(b);
-                };
-
-                window.electronAPI.desktop.capabilities().then((caps) => {
-                    if (PosnicPro.userACL && PosnicPro.userACL.branch && PosnicPro.userACL.branch.write) addItem(PosnicPro.i18n.t('lang_desktop_app', 'App Settings'), 'app', 'settings', true);
-                    addItem(PosnicPro.i18n.t('lang_hardware_manager', 'Hardware Manager'), 'hardware', 'printer');
-                    if (['enable', 'true', true].includes(PosnicPro.local.get('table_options'))) addItem(PosnicPro.i18n.t('lang_desktop_kitchen', 'Kitchen Printing'), 'hardware:kot', 'clipboard');
-                    if (caps.backup) addItem(PosnicPro.i18n.t('lang_desktop_backups', 'Backup & Recovery'), 'backup', 'database');
-                    addItem(PosnicPro.i18n.t('lang_desktop_update_recovery', 'Updates & recovery'), 'update', 'download-cloud');
-                    addItem(PosnicPro.i18n.t('lang_desktop_cloudsync', 'Cloud Sync'), 'cloud', 'cloud');
-                    addItem(PosnicPro.i18n.t('lang_desktop_view_logs', 'View application logs'), 'log', 'file-text');
-                    addItem(PosnicPro.i18n.t('lang_about_posnic', 'About Posnic'), 'about', 'info');
-                }).catch(() => {});
-
-                fab.querySelector('.fab-btn').addEventListener('click', (e) => {
-                    e.stopPropagation();
-                    fab.classList.toggle('open');
-                    trigger.setAttribute('aria-expanded', String(fab.classList.contains('open')));
-                    if (fab.classList.contains('open')) menu.querySelector('button')?.focus();
-                });
-                fab.addEventListener('keydown', (e) => {
-                    if (e.key === 'Escape') { closeMenu(); trigger.focus(); e.preventDefault(); }
-                    const items = Array.from(menu.querySelectorAll('button'));
-                    if (!items.length || !['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(e.key)) return;
-                    e.preventDefault(); fab.classList.add('open'); trigger.setAttribute('aria-expanded', 'true');
-                    const at = items.indexOf(document.activeElement);
-                    const next = e.key === 'Home' ? 0 : e.key === 'End' ? items.length - 1 : e.key === 'ArrowDown' ? (at + 1) % items.length : (at + items.length - 1) % items.length;
-                    items[next].focus();
-                });
-                document.addEventListener('click', (e) => { if (!fab.contains(e.target)) closeMenu(); });
-                // Chromium can run a microtask between blur and focus. At that
-                // point activeElement is body, even when focus is moving to a
-                // different menu item. Hiding the menu then cancels its click.
-                fab.addEventListener('focusout', (e) => {
-                    if (!fab.contains(e.relatedTarget)) closeMenu();
-                });
-
-                // --- Tray branch switching ---------------------------------
-                // Mirror the header's branch dropdown into the tray menu, and
-                // run the app's own switch flow (incl. open-register guard)
-                // when a branch is picked from the tray.
-                if (window.electronAPI.tray) {
-                    const harvestBranches = () => {
-                        const items = document.querySelectorAll('#change_branch_list a[data-id]');
-                        if (!items.length) return;
-                        const branches = Array.from(items).map((a) => ({
-                            id: a.getAttribute('data-id'),
-                            name: (a.textContent || '').trim()
-                        })).filter((b) => b.id && b.name);
-                        const currentName = (document.querySelector('.branch-name, #current_branch_name')?.textContent || '').trim() || null;
-                        if (branches.length) {
-                            window.electronAPI.tray.setBranches({ branches, currentName });
-                        }
-                    };
-                    const list = () => document.getElementById('change_branch_list');
-                    const arm = () => {
-                        const el = list();
-                        if (!el) return setTimeout(arm, 2000);
-                        new MutationObserver(harvestBranches).observe(el, { childList: true, subtree: true });
-                        harvestBranches();
-                    };
-                    arm();
-
-                    window.electronAPI.tray.onSwitchBranch((id) => {
-                        if (window.PosnicPro?.branches?.showChange) {
-                            PosnicPro.branches.showChange(id);
-                        } else {
-                            window.location.hash = '#/branches/' + id + '/change';
-                        }
-                    });
-                }
-            })();
-        </script>
+        <!-- Desktop configuration is in Manage > Settings. Recovery remains in Electron. -->
         <script>
         /* Static-asset service worker (web / LAN counters only). The desktop
            shell is skipped: its assets are local files owned by the installer
diff --git a/frontend/layouts/sidebar.html b/frontend/layouts/sidebar.html
index 04a13ab94..cb2ee54db 100644
--- a/frontend/layouts/sidebar.html
+++ b/frontend/layouts/sidebar.html
@@ -615,7 +615,7 @@ <h5 class="menu-title">
                             <!-- Cursor Focus moved under Config (it is configuration);
                                  the #/device_setup page itself is unchanged. -->
 
-                            <li data-desktop-only><a data-module="branch" data-access="write" href="#/settings/devices" class="manage-settings-entry" id="manage_sec_devices"><i class="feather icon-printer"></i><lang class="lang_desktop_devices">Devices & Printing</lang></a></li>
+                            <li data-desktop-only><a data-module="branch" data-access="write" href="#/settings/hardware" class="manage-settings-entry" id="manage_sec_hardware"><i class="feather icon-printer"></i><lang class="lang_desktop_devices">Devices & Printing</lang></a></li>
                             <li data-desktop-only><a data-module="branch" data-access="write" href="#/settings/app" class="manage-settings-entry" id="manage_sec_app"><i class="feather icon-monitor"></i><lang class="lang_desktop_app">App Settings</lang></a></li>
                             <li data-desktop-only><a data-module="branch" data-access="write" href="#/settings/updates" class="manage-settings-entry" id="manage_sec_updates"><i class="feather icon-download-cloud"></i><lang class="lang_desktop_updates">Software Updates</lang></a></li>
                             <li data-desktop-only><a data-module="branch" data-access="write" href="#/settings/backups" class="manage-settings-entry" id="manage_sec_backups"><i class="feather icon-database"></i><lang class="lang_desktop_backups">Backup & Recovery</lang></a></li>
diff --git a/frontend/modals/branch.html b/frontend/modals/branch.html
index c172ed4a4..cbb0b813c 100644
--- a/frontend/modals/branch.html
+++ b/frontend/modals/branch.html
@@ -59,6 +59,7 @@ <h4 id="exampleModalCenterTitle"><span id="branch_title"><lang class="lang_nav_a
                         <select class="select2 setState" name="state" data-page="branch_state" id="branch_state" required></select>
                     </div>                                                    
                 </div> 
+                <div class="form-row"><div class="form-group col-md-12"><label for="branch_city"><lang class="lang_city_title">City</lang></label><input type="text" id="branch_city" name="city" class="form-control border-control branch-trigger" maxlength="50"></div></div>
                 <div class="form-row">                                                                            
                     <div class="form-group col-8">
                         <label class="form-control-placeholder" for="register"><lang class="lang_addregister_title"> Add Register </lang> </label>
diff --git a/frontend/modules/sales_write.html b/frontend/modules/sales_write.html
index 224807dda..65875831d 100644
--- a/frontend/modules/sales_write.html
+++ b/frontend/modules/sales_write.html
@@ -131,11 +131,13 @@ <h4 class="page-title break_title"><span id="sales-text-change"><lang class="lan
 
                         <div class="col-xs-12 col-md-6 col-lg-6 col-xl-6 mobile-hide" id="items_view_hide">
                             <div class="row">
-                                <div class="col-12 input-group bootstrap-touchspin" style="padding-right: 18px;">
+                                <div class="col-12 input-group bootstrap-touchspin sales-search-toolbar" style="padding-right: 18px;">
                                     <input type="text" placeholder="Find item name, sku or barcode" data-t-placeholder="lang_find_item_name_sku_or_barcode_2"
                                         name="sales_new_item_name" id="sales_new_item_name"
                                         class="form-control border-control osk-trigger">
 
+                                    <button type="button" id="sales_customer_btn" class="btn btn-outline-primary toggle-user-input sales-customer-btn" aria-expanded="false" aria-controls="sales_customer_popup" aria-label="Customer details" data-t-aria-label="lang_customer_details"><i class="feather icon-user"></i></button>
+
                                     <!-- Camera scan (Loyverse study L3): shown only where the
                                          browser has BarcodeDetector - sales.js gates it. -->
                                     <a href="javascript:void(0)" id="camera_scan_btn"
@@ -158,29 +160,29 @@ <h4 class="page-title break_title"><span id="sales-text-change"><lang class="lan
                                 </div>
                             </div>
 
-                            <div class="sales-customer-entry">
-                                <label for="sales_new_customer_name"><lang class="lang_customer_name">Customer name</lang></label>
-                                <input type="text" id="sales_new_customer_name" placeholder="Walk-in customer" data-t-placeholder="lang_walk_in_customer" class="form-control osk-trigger clear-sale-text" maxlength="200" autocomplete="off">
-                                <button type="button" id="sales_customer_btn" class="btn btn-outline-primary toggle-user-input sales-customer-btn" aria-label="Customer details" data-t-aria-label="lang_customer_details"><i class="feather icon-user"></i><span id="sales_customer_btn_label"><lang class="lang_details">Details</lang></span></button>
-                            </div>
-                            <div class="toggle-customer-user sales-customer-pop" style="display:none;">
+                            <div id="sales_customer_popup" role="region" aria-label="Customer details" data-t-aria-label="lang_customer_details" class="toggle-customer-user sales-customer-pop" style="display:none;">
                                 <div class="sales-customer-pop-head">
                                     <span class="sales-customer-pop-title"><i
                                             class="feather icon-users mr-1"></i><lang class="lang_customer_details">Customer details</lang></span>
                                     <a href="javascript:void(0)" class="sales-customer-pop-x"
                                         id="sales_customer_pop_close" title="Close" data-t-title="lang_close_title"><lang class="lang_text">&times;</lang></a>
                                 </div>
-                                <p class="text-muted"><lang class="lang_bill_customer_details_help">Optional details for this bill. Use Add new customer to save a customer record.</lang></p>
+                                <label for="sales_new_customer_name"><lang class="lang_search_customer_or_enter_a_new_name">Search customer or enter a new name</lang></label>
+                                <input type="text" id="sales_new_customer_name" placeholder="Name or mobile number" data-t-placeholder="lang_name_or_mobile_number" class="form-control osk-trigger clear-sale-text" maxlength="200" autocomplete="off">
+                                <div id="sales_customer_results"></div>
+                                <div id="sales_customer_status" role="status" class="small my-2"></div>
+                                <p class="text-muted"><lang class="lang_bill_customer_details_help">Optional details for this bill. Use Save new customer to save these details as a customer record.</lang></p>
                                 <label><lang class="lang_phone">Phone:</lang><input type="tel" name="sales_new_customer_phone" id="sales_new_customer_phone" class="form-control" maxlength="40"></label>
                                 <label><lang class="lang_email">Email:</lang><input type="email" name="sales_new_customer_email" id="sales_new_customer_email" class="form-control" maxlength="254"></label>
                                 <label><lang class="lang_address">Address:</lang><textarea name="sales_new_customer_address" id="sales_new_customer_address" class="form-control" maxlength="500"></textarea></label>
                                 <!-- Recency (owner feedback): the last 10 customers picked
                                      on this till, rendered from a localStorage LRU. -->
                                 <div id="sales_recent_customers" style="display:none; max-height:220px; overflow-y:auto;"></div>
-                                <a data-module="customer" data-access="write" href="#/sales/customers/new"
+                                <button type="button" data-module="customer" data-access="write"
                                     class="sales-customer-pop-action" id="sales_customer_add_new">
-                                    <i class="feather icon-user-plus mr-2"></i><lang class="lang_add_new_customer">Add new customer</lang>
-                                </a>
+                                    <i class="feather icon-user-plus mr-2"></i><span><lang class="lang_save_new_customer">Save new customer</lang></span>
+                                </button>
+                                <button type="button" id="sales_customer_done" class="btn btn-primary"><lang class="lang_use_on_this_bill">Use on this bill</lang></button>
                                 <a href="javascript:void(0)" class="sales-customer-pop-action sales-customer-walkin"
                                     id="sales_customer_walkin">
                                     <i class="feather icon-user mr-2"></i><lang class="lang_walk_in_customer">Walk-in customer</lang>
diff --git a/frontend/modules/settings_write.html b/frontend/modules/settings_write.html
index 794f89d6e..195af5ac8 100644
--- a/frontend/modules/settings_write.html
+++ b/frontend/modules/settings_write.html
@@ -39,7 +39,7 @@ <h4 class="page-title mb-0" id="settings_page_title"><lang class="lang_generalse
                                 </a>
                                 
                                 <div class="settings-nav-group" data-desktop-only><lang class="lang_desktop_this_computer">This computer</lang></div>
-                                <a class="nav-link mb-2" data-desktop-only data-module="branch" data-access="write" id="v-pills-devices-tab" data-toggle="pill" href="#v-pills-devices" role="tab" aria-controls="v-pills-devices" aria-selected="false"><i class="feather icon-printer mr-2"></i><lang class="lang_desktop_devices">Devices & Printing</lang></a>
+                                <a class="nav-link mb-2" data-desktop-only data-module="branch" data-access="write" id="v-pills-hardware-tab" data-toggle="pill" href="#v-pills-hardware" role="tab" aria-controls="v-pills-hardware" aria-selected="false"><i class="feather icon-printer mr-2"></i><lang class="lang_desktop_devices">Devices & Printing</lang></a>
                                 <a class="nav-link mb-2" data-desktop-only data-module="branch" data-access="write" id="v-pills-app-tab" data-toggle="pill" href="#v-pills-app" role="tab" aria-controls="v-pills-app" aria-selected="false"><i class="feather icon-monitor mr-2"></i><lang class="lang_desktop_app">App Settings</lang></a>
                                 <a class="nav-link mb-2" data-desktop-only data-module="branch" data-access="write" id="v-pills-updates-tab" data-toggle="pill" href="#v-pills-updates" role="tab" aria-controls="v-pills-updates" aria-selected="false"><i class="feather icon-download-cloud mr-2"></i><lang class="lang_desktop_updates">Software Updates</lang></a>
                                 <a class="nav-link mb-2" data-desktop-only data-module="branch" data-access="write" id="v-pills-backups-tab" data-toggle="pill" href="#v-pills-backups" role="tab" aria-controls="v-pills-backups" aria-selected="false"><i class="feather icon-database mr-2"></i><lang class="lang_desktop_backups">Backup & Recovery</lang></a>
@@ -213,7 +213,7 @@ <h4 class="page-title mb-0" id="settings_page_title"><lang class="lang_generalse
                 <!-- Start col -->
                 <div class="col-lg-7 col-xl-9">
                     <div class="tab-content loader-view-mystore" id="v-pills-tabContent">
-                        <div class="tab-pane fade" id="v-pills-devices" role="tabpanel" aria-labelledby="v-pills-devices-tab"><div class="card"><div class="card-body" data-desktop-page="devices"></div></div></div>
+                        <div class="tab-pane fade" id="v-pills-hardware" role="tabpanel" aria-labelledby="v-pills-hardware-tab"><div class="card"><div class="card-body" data-desktop-page="hardware"></div></div></div>
                         <div class="tab-pane fade" id="v-pills-app" role="tabpanel" aria-labelledby="v-pills-app-tab"><div class="card"><div class="card-body" data-desktop-page="app"></div></div></div>
                         <div class="tab-pane fade" id="v-pills-updates" role="tabpanel" aria-labelledby="v-pills-updates-tab"><div class="card"><div class="card-body" data-desktop-page="updates"></div></div></div>
                         <div class="tab-pane fade" id="v-pills-backups" role="tabpanel" aria-labelledby="v-pills-backups-tab"><div class="card"><div class="card-body" data-desktop-page="backups"></div></div></div>
diff --git a/frontend/pages_css_js_map.json b/frontend/pages_css_js_map.json
index e90bf5fc7..ee60450c2 100644
--- a/frontend/pages_css_js_map.json
+++ b/frontend/pages_css_js_map.json
@@ -32,6 +32,7 @@
             "static/style/css/component.css",
             "static/style/plugins/sweet-alert2/sweetalert2.min.css",
             "static/pages/lock-screen.css",
+            "static/style/css/record-workspace.css",
             "static/style/css/rtl.css"
         ],
         "js": [
@@ -178,7 +179,8 @@
             "static/script/js/core/order-alert.js",
             "static/script/js/core/kitchen-call.js",
             "static/script/js/core/online-order-watch.js",
-            "static/script/js/core/request-dock.js"
+            "static/script/js/core/request-dock.js",
+            "static/script/js/core/record-workspace.js"
         ]
     },
     "login": {
diff --git a/frontend/static/script/js/core/record-workspace.js b/frontend/static/script/js/core/record-workspace.js
new file mode 100644
index 000000000..40466953c
--- /dev/null
+++ b/frontend/static/script/js/core/record-workspace.js
@@ -0,0 +1,318 @@
+/* Presentation only: move existing controls, never clone forms or replace save handlers. */
+(function () {
+    'use strict';
+    function label(key, fallback) {
+        // Literal keys keep the translation extractor and staff editor in sync.
+        switch (key) {
+        case 'lang_record_checkout': fallback = PosnicPro.i18n.t('lang_record_checkout', 'Checkout'); break;
+        case 'lang_record_receipts': fallback = PosnicPro.i18n.t('lang_record_receipts', 'Receipts & sharing'); break;
+        case 'lang_record_controls': fallback = PosnicPro.i18n.t('lang_record_controls', 'Controls'); break;
+        case 'lang_record_regional': fallback = PosnicPro.i18n.t('lang_record_regional', 'Regional & tax'); break;
+        case 'lang_vieweditprofile_title': fallback = PosnicPro.i18n.t('lang_vieweditprofile_title', 'Profile Details'); break;
+        case 'lang_record_print_details': fallback = PosnicPro.i18n.t('lang_record_print_details', 'Printing details'); break;
+        case 'lang_record_access': fallback = PosnicPro.i18n.t('lang_record_access', 'Access & branches'); break;
+        case 'lang_record_setup': fallback = PosnicPro.i18n.t('lang_record_setup', 'Registers & setup'); break;
+        }
+        var node = document.createElement('lang');
+        node.className = key;
+        node.textContent = PosnicPro.i18n ? PosnicPro.i18n.t(key, fallback) : fallback;
+        return node;
+    }
+    function section(parent, key, title) {
+        var box = document.createElement('section');
+        box.className = 'record-section';
+        var heading = document.createElement('h5');
+        heading.appendChild(label(key, title));
+        box.appendChild(heading);
+        var grid = document.createElement('div');
+        grid.className = 'record-grid';
+        box.appendChild(grid);
+        parent.appendChild(box);
+        return grid;
+    }
+    function moveFields(root, target, ids) {
+        ids.forEach(function (id) {
+            var input = root.querySelector('#' + id);
+            var group = input && input.closest('.form-group');
+            if (group && !target.contains(group)) {
+                if (group.parentElement.classList.contains('hide_show_user_password')) group.classList.add('hide_show_user_password');
+                target.appendChild(group);
+            }
+        });
+    }
+    function details(form, key, title, ids) {
+        var box = document.createElement('details');
+        box.className = 'record-details';
+        var summary = document.createElement('summary');
+        summary.appendChild(label(key, title));
+        box.appendChild(summary);
+        var grid = document.createElement('div');
+        grid.className = 'record-grid';
+        box.appendChild(grid);
+        moveFields(form, grid, ids);
+        if (grid.children.length) form.appendChild(box);
+        return box;
+    }
+    function formTabs(form, names, choose) {
+        var children = Array.from(form.children);
+        var nav = document.createElement('div');
+        nav.className = 'record-tabs'; nav.setAttribute('role', 'tablist');
+        var panels = names.map(function (name, index) {
+            var panel = document.createElement('div');
+            panel.className = 'record-form-panel'; panel.id = form.id + '-section-' + index;
+            panel.setAttribute('role', 'tabpanel');
+            var button = document.createElement('button'); button.type = 'button';
+            button.id = panel.id + '-tab'; button.setAttribute('role', 'tab');
+            button.setAttribute('aria-controls', panel.id); panel.setAttribute('aria-labelledby', button.id);
+            button.appendChild(label(name[0], name[1]));
+            button.onclick = function () { show(index); };
+            button.onkeydown = function (event) {
+                if (event.key !== 'ArrowRight' && event.key !== 'ArrowLeft') return;
+                event.preventDefault();
+                var next = (index + (event.key === 'ArrowRight' ? 1 : names.length - 1)) % names.length;
+                show(next); nav.children[next].focus();
+            };
+            nav.appendChild(button); form.appendChild(panel); return panel;
+        });
+        function show(index) {
+            panels.forEach(function (p, i) { p.hidden = i !== index; nav.children[i].setAttribute('aria-selected', String(i === index)); });
+        }
+        children.forEach(function (child) {
+            if (child.classList.contains('record-actions') || child.matches('input[type="hidden"]')) return;
+            panels[choose(child)].appendChild(child);
+        });
+        form.prepend(nav);
+        var actions = form.querySelector('.record-actions');
+        if (actions) form.appendChild(actions);
+        function validateAll() {
+            panels.forEach(function (p) { p.hidden = false; });
+            form.querySelectorAll('details.record-details').forEach(function (p) { p.open = true; });
+        }
+        // Reveal before native and jQuery validation, so hidden sections never skip required fields.
+        form.addEventListener('click', function (event) { if (event.target.closest('button[type="submit"],#clicksubmit')) validateAll(); }, true);
+        form.addEventListener('keydown', function (event) { if (event.key === 'Enter' && event.target.tagName !== 'TEXTAREA' && event.target.tagName !== 'BUTTON') validateAll(); }, true);
+        form.addEventListener('submit', validateAll, true);
+        function reveal(input) {
+            var index = panels.findIndex(function (p) { return p.contains(input); });
+            if (index >= 0) show(index);
+        }
+        form.addEventListener('invalid', function (event) { reveal(event.target); }, true);
+        $(form).on('invalid-form.recordWorkspace', function (event, validator) {
+            if (validator.errorList.length) reveal(validator.errorList[0].element);
+        });
+        show(0);
+    }
+    function decorateDialog(panel) {
+        if (!panel || panel.dataset.recordReady) return;
+        var form = panel.querySelector('form');
+        if (!form) return;
+        panel.dataset.recordReady = 'true';
+        panel.classList.add('record-dialog');
+        panel.setAttribute('role', 'dialog');
+        panel.setAttribute('aria-modal', 'true');
+        panel.addEventListener('keydown', function (event) {
+            if (event.key !== 'Tab') return;
+            var focusable = Array.from(panel.querySelectorAll('button,a[href],input,select,textarea')).filter(function (node) {
+                return !node.disabled && node.tabIndex !== -1 && node.getClientRects().length;
+            });
+            var first = focusable[0], last = focusable[focusable.length - 1];
+            if (event.shiftKey && document.activeElement === first) { event.preventDefault(); last.focus(); }
+            else if (!event.shiftKey && document.activeElement === last) { event.preventDefault(); first.focus(); }
+        });
+        var heading = panel.querySelector('.infobar-settings-sidebar-head h4');
+        if (heading) {
+            heading.id = panel.id + '-heading';
+            panel.setAttribute('aria-labelledby', heading.id);
+        }
+        // Keep every button and its existing handler, including Reset on edits.
+        var submit = form.querySelector('button[type="submit"]') || panel.querySelector('#clicksubmit');
+        if (submit) {
+            var actions = submit.closest('.form-row') || submit.parentElement;
+            actions.classList.add('record-actions');
+            form.appendChild(actions);
+            submit.classList.remove('btn-outline-primary');
+            submit.classList.add('btn-primary');
+        }
+        // Optional sections must not cause jQuery Validate to skip their fields.
+        form.addEventListener('submit', function () {
+            form.querySelectorAll('details.record-details').forEach(function (node) { node.open = true; });
+        }, true);
+        form.addEventListener('invalid', function (event) {
+            var box = event.target.closest('details');
+            if (box) box.open = true;
+        }, true);
+        panel.querySelectorAll('input,select,textarea').forEach(function (input) {
+            input.addEventListener('focus', function () {
+                var box = input.closest('details');
+                if (box) box.open = true;
+            });
+        });
+    }
+    function contacts(kind, formId) {
+        var form = document.getElementById(formId);
+        if (!form) return;
+        var basics = section(form, kind === 'customer' ? 'lang_newcustomer_title' : 'lang_newsupplier_title', kind === 'customer' ? PosnicPro.i18n.t('lang_newcustomer_title', 'Customer') : PosnicPro.i18n.t('lang_newsupplier_title', 'Supplier'));
+        moveFields(form, basics, [kind + '_name', kind + '_phone', kind + '_email']);
+        var address = section(form, 'lang_address_title', 'Address');
+        moveFields(form, address, [kind + '_address', kind + '_country', kind + '_state', kind + '_city']);
+        if (kind === 'customer') details(form, 'lang_choosecategory_title', 'Category', ['customer_category', 'customer_referrer_name']);
+        // Leave tax/credit controls and their conditional visibility intact, below identity.
+        form.prepend(basics.parentElement, address.parentElement);
+        form.querySelectorAll(':scope > .form-row').forEach(function (row) {
+            if (!row.children.length) row.remove();
+        });
+        decorateDialog(form.closest('.infobar-settings-sidebar'));
+    }
+    function shapes() {
+        document.querySelectorAll('#category_tile_shapes .tile-shape, #category_tile_swatches .tile-swatch').forEach(function (old) {
+            var button = document.createElement('button');
+            button.type = 'button';
+            Array.from(old.attributes).forEach(function (attr) {
+                if (attr.name !== 'style' && attr.name !== 'title' && attr.name !== 'data-t-title') button.setAttribute(attr.name, attr.value);
+            });
+            var shape = old.dataset.shape;
+            button.setAttribute('aria-pressed', old.classList.contains('is-picked') ? 'true' : 'false');
+            if (shape) {
+                var glyph = document.createElement('span');
+                glyph.className = 'record-shape record-shape-' + shape;
+                glyph.setAttribute('aria-hidden', 'true');
+                button.appendChild(glyph);
+                button.appendChild(label('lang_' + shape, shape.charAt(0).toUpperCase() + shape.slice(1)));
+            } else {
+                button.style.backgroundColor = old.dataset.color || 'transparent';
+                button.setAttribute('aria-label', old.dataset.color || 'Default');
+                if (!old.dataset.color) button.textContent = '×';
+            }
+            old.replaceWith(button);
+        });
+    }
+    function sales() {
+        var root = document.getElementById('core-tab-sale');
+        if (!root) return;
+        root.classList.add('record-sales');
+        var original = Array.from(root.children);
+        var nav = document.createElement('div');
+        nav.className = 'record-tabs';
+        nav.setAttribute('role', 'tablist');
+        var names = [['lang_record_checkout', 'Checkout'], ['lang_sales_item_search', 'Product search'], ['lang_record_receipts', 'Receipts & sharing'], ['lang_record_controls', 'Controls']];
+        var panels = names.map(function (name, index) {
+            var panel = document.createElement('div');
+            panel.className = 'record-sales-panel';
+            panel.id = 'record-sales-panel-' + index;
+            panel.setAttribute('role', 'tabpanel');
+            panel.hidden = index !== 0;
+            var button = document.createElement('button');
+            button.type = 'button';
+            button.id = 'record-sales-tab-' + index;
+            button.setAttribute('role', 'tab');
+            button.setAttribute('aria-controls', panel.id);
+            button.setAttribute('aria-selected', index === 0 ? 'true' : 'false');
+            panel.setAttribute('aria-labelledby', button.id);
+            button.appendChild(label(name[0], name[1]));
+            button.addEventListener('click', function () {
+                panels.forEach(function (p, i) { p.hidden = i !== index; nav.children[i].setAttribute('aria-selected', i === index ? 'true' : 'false'); });
+            });
+            button.addEventListener('keydown', function (event) {
+                if (event.key !== 'ArrowRight' && event.key !== 'ArrowLeft') return;
+                event.preventDefault();
+                var next = (index + (event.key === 'ArrowRight' ? 1 : 3)) % 4;
+                nav.children[next].click(); nav.children[next].focus();
+            });
+            nav.appendChild(button);
+            root.appendChild(panel);
+            return panel;
+        });
+        root.prepend(nav);
+        var search = root.querySelector('#sales_search_custom_fields');
+        if (search) panels[1].appendChild(search.closest('fieldset'));
+        var controls = ['allow_sale_date_edit', 'allow_payment_correction', 'allow_sale_hard_delete', 'pl_include_cashbook'];
+        var sharing = ['sales_sms', 'whatsapp_receipt', 'set_share_customers', 'set_share_suppliers'];
+        original.forEach(function (block) {
+            if (block.parentElement !== root) return;
+            if (block.matches('.form-row,.row')) {
+                Array.from(block.children).forEach(function (group) {
+                    var target = controls.some(function (id) { return group.querySelector('#' + id); }) ? 3 : sharing.some(function (id) { return group.querySelector('#' + id); }) ? 2 : 0;
+                    panels[target].appendChild(group);
+                });
+                block.remove();
+            } else panels[block.id === 'sharing_fieldset' ? 2 : 0].appendChild(block);
+        });
+        var form = root.closest('form');
+        if (form) {
+            form.addEventListener('submit', function () {
+                if (!root.classList.contains('active')) return;
+                panels.forEach(function (panel) { panel.hidden = false; });
+                // Existing validation runs synchronously; restore the selected section afterwards.
+                setTimeout(function () {
+                    panels.forEach(function (panel, index) { panel.hidden = nav.children[index].getAttribute('aria-selected') !== 'true'; });
+                }, 0);
+            }, true);
+            $(form).on('invalid-form.recordSales', function (event, validator) {
+                var input = validator.errorList.length && validator.errorList[0].element;
+                var index = panels.findIndex(function (panel) { return input && panel.contains(input); });
+                if (index >= 0) nav.children[index].click();
+            });
+        }
+    }
+    function branchEdit() {
+        var form = document.getElementById('setting_add');
+        if (!form) return;
+        var page = form.closest('#branchedit_new');
+        if (!page) return;
+        page.classList.add('record-branch-page');
+        var basics = section(form, 'lang_shopinfo', 'Branch / Outlet Info');
+        moveFields(form, basics, ['store_name', 'store_email', 'store_telephone', 'store_alternativephone', 'store_address', 'setting_country', 'setting_state', 'city', 'pincode']);
+        var regional = section(form, 'lang_record_regional', 'Regional & tax');
+        moveFields(form, regional, ['currency_setting', 'currency_type', 'time_zone', 'storedate', 'branch_gstin_number']);
+        details(form, 'lang_record_print_details', 'Printing details', ['printing_address', 'website']);
+        form.prepend(basics.parentElement, regional.parentElement);
+        var submit = form.querySelector('button[type="submit"]');
+        if (submit) {
+            var actions = submit.closest('.card-footer') || submit.parentElement;
+            actions.classList.add('record-actions');
+            form.appendChild(actions);
+        }
+        formTabs(form, [['lang_shopinfo', 'Branch / Outlet Info'], ['lang_record_regional', 'Regional & tax'], ['lang_record_setup', 'Registers & setup']], function (child) {
+            if (child === basics.parentElement) return 0;
+            if (child === regional.parentElement) return 1;
+            return 2;
+        });
+    }
+    var initialized = false;
+    function init() {
+        if (initialized) return;
+        initialized = true;
+        contacts('customer', 'customer_add_form');
+        contacts('supplier', 'supplier_add');
+        ['users', 'branch', 'category', 'customer-category'].forEach(function (name) { decorateDialog(document.getElementById('infobar-settings-sidebar-' + name)); });
+        var branch = document.getElementById('branch_add_form');
+        if (branch) {
+            var identity = section(branch, 'lang_shopinfo', 'Branch / Outlet Info');
+            moveFields(branch, identity, ['name_branch', 'branch_phone', 'branch_email']);
+            var location = section(branch, 'lang_address_title', 'Address');
+            moveFields(branch, location, ['branch_address', 'branch_country', 'branch_state', 'branch_city']);
+            branch.prepend(identity.parentElement, location.parentElement);
+            var branchActions = branch.querySelector('.record-actions');
+            if (branchActions) branch.appendChild(branchActions);
+            formTabs(branch, [['lang_shopinfo', 'Branch / Outlet Info'], ['lang_record_setup', 'Registers & setup']], function (child) {
+                return child === identity.parentElement || child === location.parentElement ? 0 : 1;
+            });
+        }
+        var user = document.getElementById('user_form_upload');
+        if (user) {
+            var profile = section(user, 'lang_vieweditprofile_title', 'Profile Details');
+            moveFields(user, profile, ['users_firstname', 'users_lastname', 'users_name', 'users_email', 'users_password', 'users_retype_password']);
+            user.prepend(profile.parentElement);
+            var photo = user.querySelector('.profilebox');
+            if (photo) user.prepend(photo);
+            var actions = user.querySelector('.record-actions');
+            if (actions) user.appendChild(actions);
+            formTabs(user, [['lang_vieweditprofile_title', 'Profile Details'], ['lang_record_access', 'Access & branches']], function (child) {
+                return child.querySelector('#branchtype,#choose_register,#click_collapse') ? 1 : 0;
+            });
+        }
+        shapes(); sales(); branchEdit();
+    }
+    PosnicPro.recordWorkspace = { init: init };
+    $(init);
+}());
diff --git a/frontend/static/script/js/modules/js/branches.js b/frontend/static/script/js/modules/js/branches.js
index afe735e8b..ea7a3bf4a 100644
--- a/frontend/static/script/js/modules/js/branches.js
+++ b/frontend/static/script/js/modules/js/branches.js
@@ -21,6 +21,7 @@ PosnicPro.branches = {
         $('#branch_id').val('');
         $('#branch_country').val(PosnicPro.local.get("country_setting")).trigger('change.select2');
         PosnicPro.local.set('edit_branch_state', PosnicPro.local.get("state_setting"));
+        $('#branch_city').val(PosnicPro.local.get("city_setting") || "");
         var countryDetail = $('#branch_country').select2("data");
         if (PosnicPro.branches.branchAction === 'edit') {
             PosnicPro.branches.branchClearform();
@@ -514,6 +515,7 @@ PosnicPro.branches = {
             if (response.type === 'success') {
                 $('#branches_new').modal('show');
                 data = response.data;
+                PosnicPro.local.set('edit_branch_state', data.state);
                 PosnicPro.branches.loadSelectBranchState(data.country_id, 'edit');
                 PosnicPro.record_id = id;
                 $('#branch_id').val(PosnicPro.record_id);
@@ -522,6 +524,7 @@ PosnicPro.branches = {
                 PosnicPro.branches.branch_phone.setNumber(data.store_telephone || '');
                 $('#branch_email').val(data.store_email);
                 $('#branch_address').val(data.store_address);
+                $('#branch_city').val(data.city || '');
                 $('#branch_country').val(data.country).trigger('change.select2');
                 PosnicPro.local.set('edit_branch_state', data.state);
                 $('#branch_title').text(PosnicPro.i18n.t('lang_action_edit', 'Edit'));
@@ -628,6 +631,7 @@ PosnicPro.branches = {
         $('.register-wrapper .register-fields .register-input:nth-child(n+2)').remove();
         $('#branch_country').val(PosnicPro.local.get("country_setting")).trigger('change.select2');
         PosnicPro.local.set('edit_branch_state', PosnicPro.local.get("state_setting"));
+        $('#branch_city').val(PosnicPro.local.get("city_setting") || "");
         $('#branch_address').html('');
         $('.error_branch').css('display', 'none');
         var $lastChild = $('.register-input:last-child');
@@ -635,25 +639,24 @@ PosnicPro.branches = {
     },
     loadSelectBranchState: function (id, action) {
         var stateSelect = $('#branch_state');
+        var request = (PosnicPro.branches.stateRequest || 0) + 1;
+        PosnicPro.branches.stateRequest = request;
+        var selectedState = action === 'edit' ? PosnicPro.local.get('edit_branch_state') :
+            (action === 'add' || action === 'clear') ? PosnicPro.local.get('state_setting') : '';
         var params = {
             url: 'setting/getJSONState',
             data: {id: id}
         };
         PosnicPro.get(params, function (response) {
+            if (PosnicPro.branches.stateRequest !== request) return;
             stateSelect.empty();
-            suggestions: $.map(response.data['stateJsonArray'], function (dataItem) {
-                var options;
-                options += '<option value="' + dataItem + '">' + dataItem + ' </option>';
-                stateSelect.append(options).trigger('change');
+            stateSelect.append(new Option('', ''));
+            (response.data.stateJsonArray || []).forEach(function (state) {
+                stateSelect.append(new Option(state, state));
             });
-
-            if (PosnicPro.local.get('edit_branch_state') !== '' && action === 'edit') {
-                stateSelect.val(PosnicPro.local.get('edit_branch_state')).trigger('change.select2');
-                (PosnicPro.branches.branch_phone || { setCountry: function () {} }).setCountry(response.data['countrySortName']);
-            } else {
-                $('#branch_state option:eq(0)').prop('selected', true);
-                (PosnicPro.branches.branch_phone || { setCountry: function () {} }).setCountry(response.data['countrySortName']);
-            }
+            var found = Array.from(stateSelect[0].options).some(function (option) { return option.value === selectedState; });
+            stateSelect.val(found ? selectedState : '').trigger('change.select2');
+            (PosnicPro.branches.branch_phone || { setCountry: function () {} }).setCountry(response.data.countrySortName);
         });
     },
     validForm: function () {
diff --git a/frontend/static/script/js/modules/js/categories.js b/frontend/static/script/js/modules/js/categories.js
index 2c540f201..d3e6cbe9a 100644
--- a/frontend/static/script/js/modules/js/categories.js
+++ b/frontend/static/script/js/modules/js/categories.js
@@ -1,15 +1,15 @@
 PosnicPro.categories = {
     setCatTileColor: function (color) {
         $('#category_tile_color').val(color || '');
-        $('#category_tile_swatches .tile-swatch').removeClass('is-picked').filter(function () {
+        $('#category_tile_swatches .tile-swatch').removeClass('is-picked').attr('aria-pressed', 'false').filter(function () {
             return ($(this).data('color') || '') === (color || '');
-        }).addClass('is-picked');
+        }).addClass('is-picked').attr('aria-pressed', 'true');
     },
     setCatTileShape: function (shape) {
         $('#category_tile_shape').val(shape || '');
-        $('#category_tile_shapes .tile-shape').removeClass('is-picked').filter(function () {
+        $('#category_tile_shapes .tile-shape').removeClass('is-picked').attr('aria-pressed', 'false').filter(function () {
             return ($(this).data('shape') || '') === (shape || '');
-        }).addClass('is-picked');
+        }).addClass('is-picked').attr('aria-pressed', 'true');
     },
     categoryAction: 'add',
     showAdd: function () {
diff --git a/frontend/static/script/js/modules/js/customers.js b/frontend/static/script/js/modules/js/customers.js
index 2a493b426..2b06d21af 100644
--- a/frontend/static/script/js/modules/js/customers.js
+++ b/frontend/static/script/js/modules/js/customers.js
@@ -20,7 +20,8 @@ PosnicPro.customers = {
         $('#customer_reset').show();
         $('.customer_edit_reset').hide();
         $('#customer_country').val(PosnicPro.local.get("country_setting")).trigger('change.select2');
-        PosnicPro.local.set('edit_customer_state', PosnicPro.local.get("state_setting"));        
+        PosnicPro.local.set('edit_customer_state', PosnicPro.local.get("state_setting"));
+        $('#customer_city').val(PosnicPro.local.get("city_setting") || "");
         PosnicPro.customers.addCustomerButton();
         $('.add_new_tooltip').tooltip("hide");
         if (PosnicPro.customers.customerAction === 'edit') {
@@ -771,32 +772,31 @@ PosnicPro.customers = {
         PosnicPro.customers.loadSelectCustomerState(PosnicPro.local.get('countryid'), 'clear');
         $('#customer_add_form')[0].reset();
         $('#customer_country').val(PosnicPro.local.get("country_setting")).trigger('change.select2');
-        PosnicPro.local.set('edit_customer_state', PosnicPro.local.get("state_setting"));        
+        PosnicPro.local.set('edit_customer_state', PosnicPro.local.get("state_setting"));
+        $('#customer_city').val(PosnicPro.local.get("city_setting") || "");
         $('.error_customer').css('display', 'none')
     },
     loadSelectCustomerState: function (id, action, savedPhone) {
         var stateSelect = $('#customer_state');
+        var request = (PosnicPro.customers.stateRequest || 0) + 1;
+        PosnicPro.customers.stateRequest = request;
+        var selectedState = action === 'edit' ? PosnicPro.local.get('edit_customer_state') :
+            (action === 'add' || action === 'clear') ? PosnicPro.local.get('state_setting') : '';
         var params = {
             url: 'setting/getJSONState',
             data: {id: id}
         };
         PosnicPro.get(params, function (response) {
+            if (PosnicPro.customers.stateRequest !== request) return;
             stateSelect.empty();
-            suggestions: $.map(response.data['stateJsonArray'], function (dataItem) {
-                var options;
-                options += '<option value="' + dataItem + '">' + dataItem + ' </option>';
-                stateSelect.append(options).trigger('change');
+            stateSelect.append(new Option('', ''));
+            (response.data.stateJsonArray || []).forEach(function (state) {
+                stateSelect.append(new Option(state, state));
             });
-
-            if (PosnicPro.local.get('edit_customer_state') !== '' && action === 'edit') {
-                stateSelect.val(PosnicPro.local.get('edit_customer_state')).trigger('change.select2');
-                (PosnicPro.customers.customer_phone || { setCountry: function () {} }).setCountry(response.data['countrySortName']);
-                if (action === 'edit' && savedPhone !== undefined) PosnicPro.customers.setPhone(savedPhone);
-            } else {
-                $('#customer_state option:eq(0)').prop('selected', true);
-                (PosnicPro.customers.customer_phone || { setCountry: function () {} }).setCountry(response.data['countrySortName']);
-                if (action === 'edit' && savedPhone !== undefined) PosnicPro.customers.setPhone(savedPhone);
-            }
+            var found = Array.from(stateSelect[0].options).some(function (option) { return option.value === selectedState; });
+            stateSelect.val(found ? selectedState : '').trigger('change.select2');
+            (PosnicPro.customers.customer_phone || { setCountry: function () {} }).setCountry(response.data.countrySortName);
+            if (action === 'edit' && savedPhone !== undefined) PosnicPro.customers.setPhone(savedPhone);
         }, function (xhr) {
             var response = jQuery.parseJSON(xhr.responseText);
             PosnicPro.alert(response.type, response.message);
diff --git a/frontend/static/script/js/modules/js/desktop-settings.js b/frontend/static/script/js/modules/js/desktop-settings.js
index 95afd2749..705a22d17 100644
--- a/frontend/static/script/js/modules/js/desktop-settings.js
+++ b/frontend/static/script/js/modules/js/desktop-settings.js
@@ -5,7 +5,7 @@
     var api = window.electronAPI, backup = window.electron;
     var revision = {}, states = {}, kitchenRunning = false;
     var sections = {
-        devices: ['Devices & Printing', 'Printer connections and accessories on this computer.'],
+        hardware: ['Devices & Printing', 'Printer connections and accessories on this computer.'],
         app: ['App Settings', 'Choose how Posnic starts on this computer.'],
         updates: ['Software Updates', 'Update preferences for this installation.'],
         backups: ['Backup & Recovery', 'Protect the local shop database with scheduled backups.'],
@@ -119,8 +119,8 @@
         case "saved": return PosnicPro.i18n.t('lang_desktop_saved', 'Settings saved.');
         case "working": return PosnicPro.i18n.t('lang_desktop_working', 'Working…');
         case "unsaved": return PosnicPro.i18n.t('lang_rd_unsaved_changes', 'Unsaved changes');
-        case "devices": return PosnicPro.i18n.t('lang_desktop_devices', 'Devices & Printing');
-        case "devices_help": return PosnicPro.i18n.t('lang_desktop_devices_help', 'Printer connections and accessories on this computer.');
+        case "hardware": return PosnicPro.i18n.t('lang_desktop_devices', 'Devices & Printing');
+        case "hardware_help": return PosnicPro.i18n.t('lang_desktop_devices_help', 'Printer connections and accessories on this computer.');
         case "app": return PosnicPro.i18n.t('lang_desktop_app', 'App Settings');
         case "app_help": return PosnicPro.i18n.t('lang_desktop_app_help', 'Choose how Posnic starts on this computer.');
         case "updates": return PosnicPro.i18n.t('lang_desktop_updates', 'Software Updates');
@@ -159,7 +159,7 @@
     }
     async function content(key) {
         var data, html, printers;
-        if (key === 'devices') {
+        if (key === 'hardware') {
             var loaded = await Promise.all([api.cashDrawer.loadConfig(), api.printer.list()]);
             data = loaded[0] || {}; printers = loaded[1] || []; states[key] = data;
             return card(t('receipts', 'Receipts and documents'), '<p>' + esc(t('print_location', 'Choose printers, paper and copies in Core Settings → Print → Printer Settings.')) + '</p>' + button('print-settings', t('printer_settings', 'Printer Settings')) + ' ' + open('hardware:receipt', t('test_printers', 'Test printers & view print history'))) +
diff --git a/frontend/static/script/js/modules/js/sales.js b/frontend/static/script/js/modules/js/sales.js
index 193aee97f..a895999e8 100644
--- a/frontend/static/script/js/modules/js/sales.js
+++ b/frontend/static/script/js/modules/js/sales.js
@@ -1949,7 +1949,7 @@ PosnicPro.sales = {
         if (!PosnicPro.sales.paymentOnlyMode && ($('#sales_new_items_table tbody tr').find(':nth-child(8)').text() === '' || customer_name === '')) {
             if (customer_name === '') {
                 $('.toggle-customer-user').css({ display: 'block' });
-                $("#sales_new_customer_name").focus();
+                PosnicPro.sales.setCustomerPopup(true);
                 PosnicPro.alert('error', PosnicPro.i18n.t('lang_enter_a_customer_name', 'Enter a customer name.'));
                 return false;
             }
@@ -4239,7 +4239,7 @@ PosnicPro.sales.addSale = {
 
             if (customer_name === '') {
                 $('.toggle-customer-user').css({ display: 'block' });
-                $("#sales_new_customer_name").focus();
+                PosnicPro.sales.setCustomerPopup(true);
                 PosnicPro.alert('error', PosnicPro.i18n.t('lang_enter_a_customer_name', 'Enter a customer name.'));
                 return false;
             }
@@ -4714,7 +4714,7 @@ PosnicPro.sales.editSale = {
         // Skip customer/item validation entirely in payment-only mode (items already loaded from DB)
         if (!PosnicPro.sales.paymentOnlyMode && ($('#sales_new_items_table tbody tr').find(':nth-child(8)').text() === '' || customer_name === '')) {
             if (customer_name === '') {
-                $("#sales_new_customer_name").focus();
+                PosnicPro.sales.setCustomerPopup(true);
                 PosnicPro.alert('error', PosnicPro.i18n.t('lang_enter_a_customer_name', 'Enter a customer name.'));
                 return false;
             }
@@ -5297,7 +5297,7 @@ PosnicPro.sales.holdSale = {
 
             if (customer_name === '') {
                 $('.toggle-customer-user').css({ display: 'block' });
-                $("#sales_new_customer_name").focus();
+                PosnicPro.sales.setCustomerPopup(true);
                 PosnicPro.alert('error', PosnicPro.i18n.t('lang_enter_a_customer_name', 'Enter a customer name.'));
                 return false;
             }
@@ -12056,7 +12056,7 @@ PosnicPro.sales.applyCustomerPick = function (data) {
     PosnicPro.sales.calculation.salesTableRowCart();
     if (PosnicPro.loyalty) PosnicPro.loyalty.tillShow(data.id);
     if (PosnicPro.sales.updateCustomerChip) PosnicPro.sales.updateCustomerChip();
-    $('.toggle-customer-user').hide();
+    PosnicPro.sales.setCustomerPopup(false);
     PosnicPro.sales._recentPush('recent_customers', {
         id: data.id, name: data.name, phone: data.phone, email: data.email,
         address: data.address, state: data.state, country: data.country,
@@ -12206,6 +12206,7 @@ $(document).on('click', '.recent-customer-row', function () {
 $(function () {
     var customerLookupSeq = 0;
     $('#sales_new_customer_name').autocomplete({
+        appendTo: '#sales_customer_results',
         deferRequestBy: 120,
         lookup: function (query, done) {
             var seq = ++customerLookupSeq;
@@ -12510,17 +12511,17 @@ PosnicPro.sales.updateCustomerChip = function () {
         } catch (e) { isDefaultCustomer = false; }
     }
     if (id && !isDefaultCustomer) {
-        $('#sales_customer_btn_label').text(PosnicPro.i18n.t('lang_details', 'Details'));
+
         $btn.addClass('has-customer');
         $icon.removeClass('icon-user').addClass('icon-user-check');
         var tip = (name || 'Customer') + (phone ? ' · ' + phone : '');
-        $btn.attr('data-original-title', tip).attr('title', tip);
+        $btn.attr('data-original-title', tip).attr('title', tip).attr('aria-label', 'Customer: ' + tip);
     } else {
-        $('#sales_customer_btn_label').text(PosnicPro.i18n.t('lang_details', 'Details'));
+
         $btn.removeClass('has-customer');
         $icon.removeClass('icon-user-check').addClass('icon-user');
         var t = name || PosnicPro.i18n.t('lang_customer_details', 'Customer details');
-        $btn.attr('data-original-title', t).attr('title', t);
+        $btn.attr('data-original-title', t).attr('title', t).attr('aria-label', 'Customer: ' + t);
     }
 };
 // Super-admin "lock sale date": when the setting is off, the New Sale date is
@@ -12540,20 +12541,68 @@ PosnicPro.sales.applySaleDateLock = function () {
             .attr('readonly', true).css({ 'pointer-events': 'none' });
     } catch (e) { /* fail open: leave the date editable */ }
 };
-$('.toggle-user-input').click(function () {
-    var $pop = $('.toggle-customer-user');
-    $pop.toggle();
-    if ($pop.is(':visible')) {
+PosnicPro.sales.setCustomerPopup = function (open, returnFocus) {
+    $('.toggle-customer-user').toggle(open);
+    $('#sales_customer_btn').attr('aria-expanded', String(open));
+    if (open) {
         PosnicPro.sales.renderRecentCustomers();
-        setTimeout(function () { $('#sales_new_customer_phone').trigger('focus'); }, 0);
+        $('#sales_new_customer_name').trigger('focus').trigger('select');
+    } else {
+        $('#sales_customer_results .autocomplete-suggestions').hide();
+        if (returnFocus) $('#sales_customer_btn').trigger('focus');
+    }
+};
+$('.toggle-user-input').click(function () {
+    PosnicPro.sales.setCustomerPopup($('#sales_customer_btn').attr('aria-expanded') !== 'true');
+});
+$(document).on('click', '#sales_customer_done', function () {
+    PosnicPro.sales.updateCustomerChip();
+    PosnicPro.sales.setCustomerPopup(false, true);
+});
+$(document).on('keydown', '#sales_customer_popup', function (e) {
+    if (e.key === 'Escape') {
+        e.preventDefault();
+        PosnicPro.sales.setCustomerPopup(false, true);
     }
 });
+$(document).on('click', '#sales_customer_add_new', function () {
+    var $button = $(this);
+    if ($button.prop('disabled')) return;
+    var data = {};
+    ['name', 'phone', 'email', 'address'].forEach(function (key) {
+        data[key] = ($('#sales_new_customer_' + key).val() || '').trim();
+    });
+    var $status = $('#sales_customer_status');
+    if (!data.name || $('#sales_new_customer_id').val()) {
+        $status.text(PosnicPro.i18n.t('lang_enter_a_new_customer_name_first_or_select', 'Enter a new customer name first, or select an existing customer.'));
+        $('#sales_new_customer_name').trigger('focus');
+        return;
+    }
+    $button.prop('disabled', true);
+    $status.text(PosnicPro.i18n.t('lang_saving', 'Saving ...'));
+    PosnicPro.request({method: 'POST', url: 'customers', data: JSON.stringify(data)}, function (response) {
+        $button.prop('disabled', false);
+        var saved = response.data || {};
+        var id = saved.id || saved.customer_id || saved._id;
+        if (response.type !== 'success' || !id) {
+            $status.text(response.message || 'Could not save customer. Please check the details.');
+            return;
+        }
+        $status.text(PosnicPro.i18n.t('lang_customer_saved', 'Customer saved.'));
+        PosnicPro.sales.applyCustomerPick(Object.assign({}, data, saved, {id: id}));
+        PosnicPro.sales.setCustomerPopup(false, true);
+    }, function (xhr) {
+        $button.prop('disabled', false);
+        var response = xhr.responseJSON || {};
+        $status.text(response.message || 'Could not save customer. Check the details and try again.');
+    });
+});
 // Customer popover: close on the × or an outside click; "Walk-in" clears the
 // customer back to none. Selecting a search result (autocomplete onSelect) also
 // closes it. The popover reuses #sales_new_customer_name so search/submit are
 // unchanged - only the presentation moved into a floating card.
 $(document).on('click', '#sales_customer_pop_close', function () {
-    $('.toggle-customer-user').hide();
+    PosnicPro.sales.setCustomerPopup(false);
 });
 $(document).on('click', '#sales_customer_walkin', function (e) {
     e.preventDefault();
@@ -12571,13 +12620,13 @@ $(document).on('click', '#sales_customer_walkin', function (e) {
     if (PosnicPro.sales.calculation && PosnicPro.sales.calculation.salesTableRowCart) {
         PosnicPro.sales.calculation.salesTableRowCart();
     }
-    $('.toggle-customer-user').hide();
+    PosnicPro.sales.setCustomerPopup(false);
 });
 $(document).on('mousedown', function (e) {
     var $pop = $('.toggle-customer-user');
     if (!$pop.length || !$pop.is(':visible')) { return; }
     if ($(e.target).closest('.toggle-customer-user, .sales-customer-entry, #sales_customer_btn, .autocomplete-suggestions').length === 0) {
-        $pop.hide();
+        PosnicPro.sales.setCustomerPopup(false);
     }
 });
 $(document).ready(function () {
diff --git a/frontend/static/script/js/modules/js/settings.js b/frontend/static/script/js/modules/js/settings.js
index 2277ee59b..f37e83f5e 100644
--- a/frontend/static/script/js/modules/js/settings.js
+++ b/frontend/static/script/js/modules/js/settings.js
@@ -620,6 +620,8 @@ PosnicPro.settings = {
                     $('.display-currency').text(currency);
                     $('#setting_status').val("Yes");
                     PosnicPro.local.set("country_setting", response.data.country);
+                    PosnicPro.local.set("state_setting", response.data.state || "");
+                    PosnicPro.local.set("city_setting", response.data.city || "");
                     PosnicPro.local.set('countryid', response.data['country_id']);
                     PosnicPro.local.set('countryname', '');
                     PosnicPro.local.set('statename', '');
@@ -1492,6 +1494,7 @@ if ($wrapper.length) {
                 PosnicPro.local.set("country_value", data.country);
                 PosnicPro.local.set("country_setting", data.country);
                 PosnicPro.local.set("state_setting", data.state);
+                PosnicPro.local.set("city_setting", data.city || "");
                 $('#setting_country').val(data.country).trigger('change.select2');
                 let stateId = $("#setting_country option[value='" + data.country + "']").data("setting-id");
                 PosnicPro.local.set("currency_setting", data.currency);
diff --git a/frontend/static/script/js/modules/js/suppliers.js b/frontend/static/script/js/modules/js/suppliers.js
index a4b51ca78..426c67491 100644
--- a/frontend/static/script/js/modules/js/suppliers.js
+++ b/frontend/static/script/js/modules/js/suppliers.js
@@ -14,6 +14,7 @@ PosnicPro.suppliers = {
         $('.supplier_edit_reset').hide();
         $('#supplier_country').val(PosnicPro.local.get("country_setting")).trigger('change.select2');
         PosnicPro.local.set('edit_supplier_state', PosnicPro.local.get("state_setting"));
+        $('#supplier_city').val(PosnicPro.local.get("city_setting") || "");
         PosnicPro.suppliers.loadSelectSupplierState(PosnicPro.local.get('countryid'), 'add');
         PosnicPro.suppliers.addSupplierButton();
         $('.add_new_tooltip').tooltip("hide");
@@ -549,35 +550,32 @@ PosnicPro.suppliers = {
         $('#supplier_add')[0].reset();
         $('#supplier_country').val(PosnicPro.local.get("country_setting")).trigger('change.select2');
         PosnicPro.local.set('edit_supplier_state', PosnicPro.local.get("state_setting"));
+        $('#supplier_city').val(PosnicPro.local.get("city_setting") || "");
         PosnicPro.suppliers.loadSelectSupplierState(PosnicPro.local.get('countryid'), 'clear');
-        $("#supplier_gst_type option[value='" + data.gst_type + "']").prop("selected", false);
+        $("#supplier_gst_type").val("consumer");
         $('.supplier-gstr-number').hide();
         $('.error_supplier').css('display', 'none');
     },
     loadSelectSupplierState: function (id, action) {
         var stateSelect = $('#supplier_state');
+        var request = (PosnicPro.suppliers.stateRequest || 0) + 1;
+        PosnicPro.suppliers.stateRequest = request;
+        var selectedState = action === 'edit' ? PosnicPro.local.get('edit_supplier_state') :
+            (action === 'add' || action === 'clear') ? PosnicPro.local.get('state_setting') : '';
         var params = {
             url: 'setting/getJSONState',
             data: {id: id}
         };
         PosnicPro.get(params, function (response) {
+            if (PosnicPro.suppliers.stateRequest !== request) return;
             stateSelect.empty();
-            suggestions: $.map(response.data['stateJsonArray'], function (dataItem) {
-                var options;
-                options += '<option value="' + dataItem + '">' + dataItem + ' </option>';
-                stateSelect.append(options).trigger('change');
+            stateSelect.append(new Option('', ''));
+            (response.data.stateJsonArray || []).forEach(function (state) {
+                stateSelect.append(new Option(state, state));
             });
-            // Pre-select the stored state for every action, not just edit: the
-            // add/clear paths store the shop's own state (state_setting), so a
-            // new supplier now defaults to the shop's state instead of whatever
-            // sorts first in the list. Falls back to the first option only when
-            // no state is stored.
-            if (PosnicPro.local.get('edit_supplier_state') !== '') {
-                 stateSelect.val(PosnicPro.local.get('edit_supplier_state')).trigger('change.select2');
-            } else {
-                $('#supplier_state option:eq(0)').prop('selected', true);
-            }
-            (PosnicPro.suppliers.supplier_phone || { setCountry: function () {} }).setCountry(response.data['countrySortName']);
+            var found = Array.from(stateSelect[0].options).some(function (option) { return option.value === selectedState; });
+            stateSelect.val(found ? selectedState : '').trigger('change.select2');
+            (PosnicPro.suppliers.supplier_phone || { setCountry: function () {} }).setCountry(response.data.countrySortName);
         }, function (xhr) {
             var response = jQuery.parseJSON(xhr.responseText);
             PosnicPro.alert(response.type, response.message);
diff --git a/frontend/static/style/css/record-workspace.css b/frontend/static/style/css/record-workspace.css
new file mode 100644
index 000000000..7484ff75b
--- /dev/null
+++ b/frontend/static/style/css/record-workspace.css
@@ -0,0 +1,100 @@
+/* Shared record editor. Closed drawers keep width zero; only open editors expand. */
+.record-dialog.sidebarshow {
+    width: min(820px, calc(100vw - 64px)) !important;
+    max-width: none !important;
+    height: calc(100dvh - 64px);
+    top: 32px;
+    right: max(32px, calc((100vw - 820px) / 2));
+    border: 1px solid var(--theme-border-color);
+    border-radius: 16px;
+    box-shadow: 0 20px 70px rgba(0, 0, 0, .24) !important;
+    overflow-y: auto;
+    transition: none !important;
+    color: var(--theme-text-primary);
+}
+.record-dialog .infobar-settings-sidebar-head {
+    position: sticky;
+    top: 0;
+    z-index: 4;
+    padding: 18px 28px;
+    background: var(--theme-card-bg);
+    border-bottom: 1px solid var(--theme-border-color);
+}
+.record-dialog .infobar-settings-sidebar-head h4 { color: var(--theme-text-primary); font-weight: 600; }
+.record-dialog .infobar-settings-sidebar-body { padding-bottom: 0; }
+.record-dialog .custom-mode-setting { padding: 24px 28px 0 !important; }
+.record-dialog .profilebox { padding: 0 0 16px; text-align: left !important; }
+.record-dialog .profilebox img { width: 64px !important; height: 64px !important; object-fit: contain; }
+.record-dialog #user_image_upload { width: 64px !important; height: 64px !important; }
+.record-dialog .card-footer:empty { display: none; }
+.record-dialog .profilebox .profilename { display: inline-flex; margin-left: 12px; }
+.record-dialog .form-control, .record-dialog .custom-select,
+.record-branch-page .form-control, .record-sales .form-control {
+    min-height: 44px;
+    border-radius: 8px;
+    color: var(--theme-text-primary);
+    background: var(--theme-card-bg);
+    border-color: var(--theme-border-color);
+}
+.record-dialog .select2-container { width: 100% !important; min-width: 0; }
+.record-dialog .select2-selection { min-height: 44px; border-radius: 8px; }
+.record-dialog .form-control::placeholder { color: var(--theme-text-muted) !important; opacity: 1; }
+.record-form-panel[hidden] { display: none !important; }
+.record-dialog .record-form-panel { min-height: 250px; }
+.record-dialog label { color: var(--theme-text-primary); }
+.record-dialog .accordion .btn-link { color: var(--theme-text-primary) !important; }
+.record-dialog .form-group { margin-bottom: 20px; }
+.record-section { margin: 0 0 24px; }
+.record-section > h5 { margin: 0 0 18px; font-weight: 600; color: var(--theme-text-primary); }
+.record-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 22px; }
+.record-grid > .form-group { width: 100%; max-width: none; padding: 0; flex: none; min-width: 0; }
+.record-grid > .form-group:has(textarea), .record-grid > .form-group:has(input[name="name"]) { grid-column: 1 / -1; }
+.record-details { border-top: 1px solid var(--theme-border-color); padding: 18px 0; }
+.record-details summary { color: var(--theme-primary-color); font-weight: 500; cursor: pointer; }
+.record-details[open] summary { margin-bottom: 20px; }
+.record-actions {
+    position: sticky;
+    bottom: 0;
+    background: var(--theme-card-bg) !important;
+    border-top: 1px solid var(--theme-border-color);
+    padding: 16px 0 !important;
+    margin: 24px 0 0 !important;
+    z-index: 3;
+}
+.record-actions > .form-group { margin: 0; padding: 0; width: 100%; max-width: none; }
+.record-actions .pull-right { display: flex; flex-wrap: wrap; gap: 8px; justify-content: flex-end; float: none; }
+.record-actions .btn { min-height: 44px; border-radius: 8px; }
+.record-dialog .btn-outline-danger.infobar-settings-close { color: var(--theme-text-secondary); border-color: var(--theme-border-color); }
+.record-tabs { display: flex; flex-wrap: wrap; gap: 4px; border-bottom: 1px solid var(--theme-border-color); margin-bottom: 24px; }
+.record-tabs button { background: transparent; color: var(--theme-text-secondary); border: 0; border-bottom: 2px solid transparent; padding: 14px 18px; }
+.record-tabs button[aria-selected="true"] { color: var(--theme-primary-color); border-bottom-color: var(--theme-primary-color); }
+.record-sales-panel:not([hidden]) { display: flex; flex-wrap: wrap; gap: 8px 0; }
+.record-sales-panel[hidden] { display: none !important; }
+.record-sales-panel > .form-group { padding: 16px; border-bottom: 1px solid var(--theme-border-color); margin: 0; }
+.record-sales-panel fieldset { width: 100%; background: var(--theme-card-bg); box-shadow: none; }
+.record-sales-panel > fieldset label { padding: 6px 0; }
+.record-branch-page .contentbar { max-width: 1200px; margin: auto; }
+.record-branch-page .record-section { background: var(--theme-card-bg); border: 1px solid var(--theme-border-color); border-radius: 12px; padding: 24px; }
+.record-branch-page .profilebox img { max-width: 80px; max-height: 80px; }
+.record-branch-page .record-details { padding: 20px 24px; background: var(--theme-card-bg); margin-bottom: 20px; border-radius: 12px; }
+#category_tile_shapes { display: flex; gap: 12px; flex-wrap: wrap; margin: 12px 0; }
+#category_tile_shapes .tile-shape { display: inline-flex; flex-direction: column; align-items: center; gap: 8px; min-width: 90px; padding: 12px; border: 2px solid transparent; border-radius: 10px; color: var(--theme-text-primary); background: var(--theme-body-bg); }
+#category_tile_shapes .tile-shape.is-picked { border-color: var(--theme-primary-color); }
+.record-shape { display: block; width: 32px; height: 32px; background: var(--theme-primary-color); }
+.record-shape-square { border-radius: 0; }
+.record-shape-rounded { border-radius: 10px; }
+.record-shape-circle { border-radius: 50%; }
+.record-shape-diamond { clip-path: polygon(50% 0, 100% 50%, 50% 100%, 0 50%); }
+#category_tile_swatches .tile-swatch { width: 32px; height: 32px; border: 2px solid var(--theme-border-color); border-radius: 7px; margin: 4px; color: var(--theme-text-primary); }
+#category_tile_swatches .tile-swatch.is-picked { outline: 2px solid var(--theme-primary-color); outline-offset: 2px; }
+[dir="rtl"] .record-dialog.sidebarshow { left: max(32px, calc((100vw - 820px) / 2)); right: auto; }
+@media (max-width: 767.98px) {
+    .record-dialog.sidebarshow { width: 100vw !important; height: 100dvh; top: 0; right: 0; border-radius: 0; }
+    [dir="rtl"] .record-dialog.sidebarshow { left: 0; right: auto; }
+    .record-dialog .custom-mode-setting { padding: 20px 18px 0 !important; }
+    .record-dialog .infobar-settings-sidebar-head { padding: 14px 18px; }
+    .record-grid { grid-template-columns: 1fr; }
+    .record-sales-panel > .form-group { width: 100%; max-width: 100%; flex: 0 0 100%; }
+    .record-tabs button { padding: 12px; }
+}
+@media (prefers-reduced-motion: reduce) { .record-dialog { transition: none !important; } }
diff --git a/frontend/static/style/css/theme-variables.css b/frontend/static/style/css/theme-variables.css
index 790ad0369..5f2d0c566 100644
--- a/frontend/static/style/css/theme-variables.css
+++ b/frontend/static/style/css/theme-variables.css
@@ -3570,3 +3570,13 @@ html:not([data-theme]) .loadingSpinner::after {
 @media(max-width:767px) { .sales-history-summary { margin-left:0; width:100%; } }
 /* Recovery notice stays in document flow below the fixed dashboard chrome. */
 #offline_recovery_notice{margin-top:84px!important}
+
+/* One compact sale search row; customer actions stay inside its popup. */
+.sales-search-toolbar { flex-wrap: nowrap; gap: 8px; margin-bottom: 12px; }
+.sales-search-toolbar #sales_new_item_name { min-width: 0; }
+.sales-search-toolbar .sales-customer-btn { flex: 0 0 40px; padding: 6px; }
+#sales_customer_popup { width: 440px; max-height: min(640px, 75vh); overflow-y: auto; color: var(--theme-text-primary); }
+#sales_customer_popup #sales_new_customer_name { margin-bottom: 8px; }
+#sales_customer_results { position: relative; }
+#sales_customer_results .autocomplete-suggestions { position: relative !important; top: auto !important; left: auto !important; width: 100% !important; max-height: 180px !important; }
+#sales_customer_add_new { background: transparent; border: 1px solid currentColor; margin: 10px 0; }
diff --git a/languages/_english.json b/languages/_english.json
index 4c52e17bb..f531fb390 100644
--- a/languages/_english.json
+++ b/languages/_english.json
@@ -108,7 +108,6 @@
   "lang_add_kot_2": "+ Add KOT",
   "lang_add_many_at_once": "Add many at once",
   "lang_add_new_branch": "Add New Branch",
-  "lang_add_new_customer": "Add new customer",
   "lang_add_new_supplier_easily": "Add new supplier easily",
   "lang_add_new_template": "Add New Template",
   "lang_add_note": "Add note",
@@ -445,7 +444,7 @@
   "lang_bill_2": "Bill",
   "lang_bill_a_customer_now_get_paid_later_and_see": "Bill a customer now, get paid later - and see who still owes you.",
   "lang_bill_copies_from_the_floor": "Copies of a bill asked for from the floor",
-  "lang_bill_customer_details_help": "Optional details for this bill. Use Add new customer to save a customer record.",
+  "lang_bill_customer_details_help": "Optional details for this bill. Use Save new customer to save these details as a customer record.",
   "lang_bill_date": "Bill date",
   "lang_bill_date_oldest": "Bill date: oldest",
   "lang_bill_no": "Bill no",
@@ -1047,6 +1046,7 @@
   "lang_customer_records_changed": "Customer records changed",
   "lang_customer_reference_their_po_job_number": "Customer reference (their PO / job number)",
   "lang_customer_report": "Customer Report",
+  "lang_customer_saved": "Customer saved.",
   "lang_customer_title": "Customers",
   "lang_customercategory_detail": "Customer Category Details",
   "lang_customercategory_title": "Customer Categories",
@@ -1258,7 +1258,6 @@
   "lang_desktop_this_computer": "This computer",
   "lang_desktop_time": "Time",
   "lang_desktop_time_required": "Choose a backup time.",
-  "lang_desktop_tools": "Desktop tools",
   "lang_desktop_update_channel": "Release channel",
   "lang_desktop_update_preferences": "Update preferences",
   "lang_desktop_update_recovery": "Updates & recovery",
@@ -1269,7 +1268,6 @@
   "lang_desktop_view_logs": "View application logs",
   "lang_desktop_working": "Working…",
   "lang_detailed_report": "Detailed Report",
-  "lang_details": "Details",
   "lang_details_not_available": "Details not available",
   "lang_developer_dark": "Developer dark",
   "lang_device": "Device",
@@ -1468,6 +1466,7 @@
   "lang_enter_a_customer_phone": "Enter a Customer Phone",
   "lang_enter_a_description": "Enter a description ...",
   "lang_enter_a_mobile_number": "Enter a mobile number",
+  "lang_enter_a_new_customer_name_first_or_select": "Enter a new customer name first, or select an existing customer.",
   "lang_enter_a_non_negative_base_price_and_an_ite": "Enter a non-negative base price and an item markup from 0 to 100000%.",
   "lang_enter_a_partial_amount": "Enter a partial amount.",
   "lang_enter_a_password": "Enter a password",
@@ -3602,7 +3601,14 @@
   "lang_recommended_for_a_first_look_it_gives_the": "Recommended for a first look. It gives the sale screen something useful immediately.",
   "lang_record": "Record",
   "lang_record_a_purchase_or_an_order": "Record a purchase or an order",
+  "lang_record_access": "Access & branches",
+  "lang_record_checkout": "Checkout",
+  "lang_record_controls": "Controls",
   "lang_record_payment": "Record payment",
+  "lang_record_print_details": "Printing details",
+  "lang_record_receipts": "Receipts & sharing",
+  "lang_record_regional": "Regional & tax",
+  "lang_record_setup": "Registers & setup",
   "lang_recorded": "Recorded",
   "lang_recorded_closing_counts_by_payment_type": "Recorded closing counts by payment type",
   "lang_records_found": "Records found",
@@ -3925,6 +3931,7 @@
   "lang_save_invoice_settings": "Save invoice settings",
   "lang_save_item": "Save item",
   "lang_save_loyalty_settings": "Save loyalty settings",
+  "lang_save_new_customer": "Save new customer",
   "lang_save_note": "Save note",
   "lang_save_outlet": "Save outlet",
   "lang_save_quotation": "Save quotation",
@@ -3988,6 +3995,7 @@
   "lang_search_calls_pending_settlement_or_review": "Search calls pending settlement or review",
   "lang_search_category_name": "Search category name",
   "lang_search_commands": "Search commands",
+  "lang_search_customer_or_enter_a_new_name": "Search customer or enter a new name",
   "lang_search_customer_or_invoice": "Search customer or invoice #",
   "lang_search_customer_or_quote": "Search customer or quote #",
   "lang_search_features": "Search features",
diff --git a/languages/ne.json b/languages/ne.json
index e33ac09f9..a6f7c75c6 100644
--- a/languages/ne.json
+++ b/languages/ne.json
@@ -4539,5 +4539,19 @@
   "lang_expense_files_help": "PDF, JPG वा PNG। बढीमा ५ फाइल, प्रत्येक ५ MB र कुल १० MB सम्म। प्रविष्टि सुरक्षित गर्दा फाइलहरू सुरक्षित हुन्छन्।",
   "lang_expense_file_retry": "प्रविष्टि सुरक्षित भयो, तर केही संलग्नकहरू सुरक्षित गर्न सकिएन। पुनः प्रयास गर्न यो फारम खुला राख्नुहोस् र फेरि सुरक्षित गर्नुहोस्।",
   "lang_not_saved": "सुरक्षित गरिएको छैन",
-  "lang_download": "डाउनलोड गर्नुहोस्"
+  "lang_download": "डाउनलोड गर्नुहोस्",
+  "lang_record_access": "पहुँच र शाखाहरू",
+  "lang_record_checkout": "बिल भुक्तानी",
+  "lang_record_controls": "नियन्त्रणहरू",
+  "lang_record_print_details": "छपाइ विवरण",
+  "lang_record_profile": "प्रोफाइल",
+  "lang_record_receipts": "रसिद र साझेदारी",
+  "lang_record_regional": "क्षेत्र र कर",
+  "lang_record_setup": "क्यास काउन्टर र सेटअप",
+  "lang_customer_saved": "ग्राहक सुरक्षित गरियो।",
+  "lang_enter_a_new_customer_name_first_or_select": "पहिले नयाँ ग्राहकको नाम लेख्नुहोस् वा विद्यमान ग्राहक छान्नुहोस्।",
+  "lang_name_or_phone": "नाम वा फोन",
+  "lang_save_new_customer": "नयाँ ग्राहक सुरक्षित गर्नुहोस्",
+  "lang_saving_customer": "ग्राहक सुरक्षित गर्दै...",
+  "lang_search_customer_or_enter_a_new_name": "ग्राहक खोज्नुहोस् वा नयाँ नाम लेख्नुहोस्"
 }
diff --git a/languages/nl.json b/languages/nl.json
index 4867f8b17..1d5b994ac 100644
--- a/languages/nl.json
+++ b/languages/nl.json
@@ -4972,5 +4972,19 @@
   "lang_download": "Downloaden",
   "lang_switch_branch": "Van vestiging wisselen",
   "lang_could_not_check_the_current_register_pleas": "De huidige kassa kon niet worden gecontroleerd. Probeer het opnieuw voordat u van vestiging wisselt.",
-  "lang_this_window_belongs_to_one_branch_open_ano": "Dit venster hoort bij één vestiging. Open een andere vestiging vanuit het hoofdvenster."
+  "lang_this_window_belongs_to_one_branch_open_ano": "Dit venster hoort bij één vestiging. Open een andere vestiging vanuit het hoofdvenster.",
+  "lang_record_checkout": "Afrekenen",
+  "lang_record_receipts": "Bonnen en delen",
+  "lang_record_controls": "Beheer",
+  "lang_record_regional": "Regio en belasting",
+  "lang_record_profile": "Profiel",
+  "lang_record_print_details": "Afdrukgegevens",
+  "lang_record_access": "Toegang en filialen",
+  "lang_record_setup": "Kassa’s en inrichting",
+  "lang_customer_saved": "Klant opgeslagen.",
+  "lang_enter_a_new_customer_name_first_or_select": "Voer eerst een nieuwe klantnaam in of selecteer een bestaande klant.",
+  "lang_name_or_phone": "Naam of telefoonnummer",
+  "lang_save_new_customer": "Nieuwe klant opslaan",
+  "lang_saving_customer": "Klant opslaan...",
+  "lang_search_customer_or_enter_a_new_name": "Zoek een klant of voer een nieuwe naam in"
 }
diff --git a/src/main.js b/src/main.js
index e64073cb9..dfbabebde 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2820,6 +2820,13 @@ function createMenu() {
     }
   ];
 
+  // Keep the independent tools available when the page fails, in one place.
+  const fileMenu = template.find(item => item.label === 'File');
+  const recoveryMenu = template.find(item => item.label === 'Maintenance');
+  const recoveryItems = fileMenu.submenu.filter(item => item.label && !['App Settings', 'Exit'].includes(item.label));
+  fileMenu.submenu = fileMenu.submenu.filter(item => ['App Settings', 'Exit'].includes(item.label));
+  recoveryMenu.label = 'Help && Recovery';
+  recoveryMenu.submenu.unshift(...recoveryItems, { type: 'separator' });
   const menu = Menu.buildFromTemplate(template);
   Menu.setApplicationMenu(menu);
 }
diff --git a/tests/desktop-menu-actions.test.js b/tests/desktop-menu-actions.test.js
index db8cd2c45..c62aa687b 100644
--- a/tests/desktop-menu-actions.test.js
+++ b/tests/desktop-menu-actions.test.js
@@ -3,59 +3,26 @@ const assert = require('node:assert/strict');
 const fs = require('node:fs');
 const path = require('node:path');
 const { JSDOM } = require('jsdom');
-const source = fs.readFileSync(path.join(__dirname, '../frontend/dashboard.html'), 'utf8');
-const doc = new JSDOM(source);
-const script = [...doc.window.document.scripts].map(x => x.textContent).find(x => x.includes('Desktop tools quick-access'));
-doc.window.close();
-async function menu(t, open) {
-  const dom = new JSDOM('<button id="outside">Outside</button>', { runScripts: 'outside-only' });
-  t.after(() => dom.window.close());
-  const w = dom.window, opened = [], alerts = [];
-  w.PosnicPro = { i18n: { t: (_key, text) => text }, local: { get: () => true },
-    userACL: { branch: { write: true } }, alert: (...args) => alerts.push(args) };
-  w.hasher = { setHash: target => opened.push(target) };
-  w.console.error = () => {};
-  w.electronAPI = { desktop: { capabilities: async () => ({ backup: true }), open: open || (async target => { opened.push(target); return true; }) }, cloud: { status: async () => ({ connected: false }) } };
-  w.eval(script);
-  await new Promise(r => setImmediate(r));
-  return { w, opened, alerts, fab: w.document.querySelector('#posnic-desktop-fab'), trigger: w.document.querySelector('.fab-btn') };
-}
-test('moving focus between Desktop items must not hide the item before its click', async t => {
-  const { w, fab, trigger, opened } = await menu(t);
-  const items = [...fab.querySelectorAll('[role=menuitem]')];
-  assert.equal(items.find(x => x.textContent === 'Hardware Manager').textContent, 'Hardware Manager');
-  const targets = ['settings/app', 'hardware', 'hardware:kot', 'backup', 'update', 'cloud', 'log', 'about'];
-  for (let i = 0; i < items.length; i++) {
-    trigger.click();
-    // Chromium delivers focusout while activeElement is temporarily body.
-    // Flush the microtask here, before the destination receives focus/click.
-    items[0].blur();
-    fab.classList.add('open');
-    items[0].dispatchEvent(new w.FocusEvent('focusout', { bubbles: true, relatedTarget: items[i] }));
-    await Promise.resolve();
-    assert.ok(fab.classList.contains('open'), targets[i] + ' disappeared before click');
-    items[i].focus(); items[i].click();
-    await Promise.resolve();
-    assert.equal(opened.at(-1), targets[i]);
-    assert.equal(trigger.getAttribute('aria-expanded'), 'false');
+const read = name => fs.readFileSync(path.join(__dirname, '..', name), 'utf8');
+test('desktop settings have one in-app entry and no floating duplicate menu', () => {
+  assert.doesNotMatch(read('frontend/dashboard.html'), /posnic-desktop-fab|Desktop tools quick-access/);
+  const dom = new JSDOM(read('frontend/layouts/sidebar.html'));
+  for (const name of ['hardware', 'app', 'updates', 'backups', 'cloudsync', 'systemstatus']) {
+    const nodes = dom.window.document.querySelectorAll('[href="#/settings/' + name + '"]');
+    assert.equal(nodes.length, 1, name);
+    assert.equal(nodes[0].getAttribute('data-access'), 'write');
+    assert.ok(nodes[0].closest('[data-desktop-only]'));
   }
+  dom.window.close();
 });
-test('moving focus outside closes the menu', async t => {
-  const { w, fab, trigger } = await menu(t);
-  trigger.click(); w.document.querySelector('#outside').focus();
-  assert.equal(fab.classList.contains('open'), false);
-  assert.equal(trigger.getAttribute('aria-expanded'), 'false');
+test('desktop recovery tools remain independent of the app renderer', () => {
+  const main = read('src/main.js');
+  assert.match(main, /recoveryMenu.label = 'Help && Recovery'/);
+  assert.match(main, /recoveryMenu.submenu.unshift\(\.\.\.recoveryItems/);
+  for (const handler of ['openHardwareManager', 'openBackupManager', 'openCloudManager', 'openUpdateManager', 'openLogFolder']) assert.match(main, new RegExp(handler + '\\('));
+  assert.match(main, /accelerator: 'CmdOrCtrl\+R'/);
 });
-for (const [name, open] of [['rejected IPC', async () => { throw Error('Unavailable'); }], ['unsupported action', async () => false]]) {
-  test(name + ' gives feedback instead of a silent failure', async t => {
-    const { fab, alerts } = await menu(t, open);
-    [...fab.querySelectorAll('[role=menuitem]')].find(x => x.textContent === 'Cloud Sync').click();
-    await new Promise(r => setImmediate(r));
-    assert.equal(alerts.length, 1);
-    assert.match(alerts[0][1], /Request failed/);
-  });
-}
-test('the application log viewer can read its log through the guarded bridge', () => {
+test('the application log viewer keeps its guarded bridge', () => {
   const { isTrustedFrame } = require('../src/ipc-guard');
   assert.equal(isTrustedFrame({ url: 'file:///C:/app/resources/app.asar/src/log-viewer.html' }), true);
   assert.equal(isTrustedFrame({ url: 'https://example.com/log-viewer.html' }), false);
diff --git a/tests/desktop-settings-controls.test.js b/tests/desktop-settings-controls.test.js
index 15f99fd19..a95c6ccd2 100644
--- a/tests/desktop-settings-controls.test.js
+++ b/tests/desktop-settings-controls.test.js
@@ -7,7 +7,7 @@ const read = file => fs.readFileSync(path.join(__dirname, '..', file), 'utf8');
 const tick = () => new Promise(resolve => setImmediate(resolve));
 
 function page(t, changes = {}) {
-  const dom = new JSDOM(['devices', 'app', 'updates', 'backups', 'cloudsync', 'systemstatus', 'kitchen'].map(key => `<div data-desktop-page="${key}"></div>`).join(''), { runScripts: 'outside-only', url: 'http://localhost/' });
+  const dom = new JSDOM(['hardware', 'app', 'updates', 'backups', 'cloudsync', 'systemstatus', 'kitchen'].map(key => `<div data-desktop-page="${key}"></div>`).join(''), { runScripts: 'outside-only', url: 'http://localhost/' });
   t.after(() => dom.window.close());
   const w = dom.window, $ = require('jquery')(w), calls = [];
   w.$ = w.jQuery = $;
@@ -43,7 +43,7 @@ test('printer settings and design are separate panes without disclosure controls
 });
 
 test('the cash drawer uses existing persisted field names and preserves other configuration', async t => {
-  const p = page(t); await p.load('devices');
+  const p = page(t); await p.load('hardware');
   assert.equal(p.$('[data-field="drawerAuto"]').prop('checked'), true);
   p.$('[data-field="drawerAuto"]').prop('checked', false);
   await p.click('save-devices');
@@ -65,7 +65,7 @@ test('viewing kitchen settings never starts the worker; resuming preserves paper
 test('changing automatic drawer opening keeps an existing serial connection', async t => {
   const original = { method: 'serial', port: 'COM4', baudRate: 9600, printerName: 'Counter', pin: 0, autoOpenOnSale: false };
   const p = page(t, { setup: w => { w.electronAPI.cashDrawer.loadConfig = async () => original; } });
-  await p.load('devices');
+  await p.load('hardware');
   p.$('[data-field="drawerAuto"]').prop('checked', true);
   await p.click('save-devices');
   assert.deepEqual(p.calls[0], ['drawer', { ...original, autoOpenOnSale: true }]);
@@ -136,8 +136,8 @@ test('Linux does not offer an unsupported start-at-login switch', async t => {
 
 test('unprivileged users cannot load or save desktop configuration', async t => {
   const p = page(t, { setup: w => { w.PosnicPro.userACL.branch.write = false; } });
-  await p.load('devices');
-  assert.match(p.$('[data-desktop-page="devices"]').text(), /administrator/);
+  await p.load('hardware');
+  assert.match(p.$('[data-desktop-page="hardware"]').text(), /administrator/);
   assert.equal(p.$('[data-desktop-action="save-devices"]').length, 0);
   assert.deepEqual(p.calls, []);
 });
diff --git a/tests/record-workspace.test.js b/tests/record-workspace.test.js
new file mode 100644
index 000000000..013068044
--- /dev/null
+++ b/tests/record-workspace.test.js
@@ -0,0 +1,104 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+const { JSDOM } = require('jsdom');
+const root = path.join(__dirname, '..');
+const read = p => fs.readFileSync(path.join(root, p), 'utf8');
+function fixture() {
+  const files = ['modals/user.html', 'modals/customer.html', 'modals/supplier.html', 'modals/branch.html', 'modals/category_add.html', 'modules/branchEdit.html', 'modules/settings_write.html'];
+  const dom = new JSDOM(files.map(p => read('frontend/' + p)).join('\n'), { runScripts: 'outside-only' });
+  const w = dom.window;
+  w.eval(read('frontend/static/script/js/jquery.min.js'));
+  w.PosnicPro = { i18n: { t: (key, text) => text } };
+  return { dom, w, d: w.document };
+}
+test('reorganizing retains every control, form owner, current value and submit handler', () => {
+  const { w, d, dom } = fixture();
+  const controls = Array.from(d.querySelectorAll('input,select,textarea')).map(node => ({ node, owner: node.form, name: node.name, value: node.value }));
+  const form = d.querySelector('#customer_add_form');
+  let saves = 0;
+  form.addEventListener('submit', e => { e.preventDefault(); saves++; });
+  w.eval(read('frontend/static/script/js/core/record-workspace.js'));
+  w.PosnicPro.recordWorkspace.init();
+  for (const { node, owner, name, value } of controls) {
+    assert.equal(node.isConnected, true, node.id);
+    assert.equal(node.form, owner, node.id + ' form owner');
+    assert.equal(node.name, name, node.id);
+    assert.equal(node.value, value, node.id);
+  }
+  form.dispatchEvent(new w.Event('submit', { bubbles: true, cancelable: true }));
+  assert.equal(saves, 1);
+  assert.ok(d.querySelector('#users_password').closest('.hide_show_user_password'));
+  assert.ok(d.querySelector('#customer_name').closest('.record-section'));
+  assert.equal(d.querySelectorAll('#category_tile_shapes button').length, 4);
+  for (const b of d.querySelectorAll('#category_tile_shapes button')) {
+    assert.equal(b.type, 'button');
+    assert.ok(b.querySelector('.record-shape-' + b.dataset.shape));
+    assert.ok(b.textContent.trim());
+  }
+  w.PosnicPro.recordWorkspace.init();
+  assert.equal(d.querySelectorAll('#core-tab-sale .record-tabs').length, 1);
+  dom.window.close();
+});
+test('sales sections switch locally without changing saved values or control availability', () => {
+  const { w, d, dom } = fixture();
+  w.eval(read('frontend/static/script/js/core/record-workspace.js'));
+  w.PosnicPro.recordWorkspace.init();
+  assert.ok(d.querySelector('#sales_search_custom_fields').closest('#record-sales-panel-1'));
+  assert.ok(d.querySelector('#allow_payment_correction').closest('#record-sales-panel-3'));
+  assert.ok(d.querySelector('#sales_sms').closest('#record-sales-panel-2'));
+  assert.ok(d.querySelector('#set_share_customers').closest('#record-sales-panel-2'));
+  const field = d.querySelector('#sales_prefix'); field.value = 'ABC';
+  d.querySelector('#record-sales-tab-1').click();
+  assert.equal(d.querySelector('#record-sales-panel-1').hidden, false);
+  assert.equal(d.querySelector('#record-sales-panel-0').hidden, true);
+  assert.equal(field.value, 'ABC'); assert.equal(field.disabled, false);
+  dom.window.close();
+});
+test('user sections reveal all inputs before the existing save handler validates', () => {
+  const { w, d, dom } = fixture();
+  w.eval(read('frontend/static/script/js/core/record-workspace.js'));
+  w.PosnicPro.recordWorkspace.init();
+  const form = d.querySelector('#user_form_upload');
+  const access = d.querySelector('#branchtype').closest('.record-form-panel');
+  assert.equal(access.hidden, true);
+  const save = d.querySelector('#clicksubmit');
+  assert.ok(save.closest('.record-actions'));
+  assert.equal(save.closest('form'), form);
+  let called = false;
+  save.addEventListener('click', () => { called = true; assert.equal(access.hidden, false); });
+  save.click();
+  assert.equal(called, true);
+  d.querySelector('#branchtype').dispatchEvent(new w.Event('invalid'));
+  assert.equal(access.hidden, false);
+  assert.equal(d.querySelector('#users_firstname').closest('.record-form-panel').hidden, true);
+  dom.window.close();
+});
+for (const kind of ['customer', 'supplier', 'branch']) {
+  test(kind + ' uses shop state for new records, saved state on edits, and rejects stale country responses', () => {
+    const plural = kind === 'branch' ? 'branches' : kind + 's';
+    const cap = kind[0].toUpperCase() + kind.slice(1);
+    const source = read('frontend/static/script/js/modules/js/' + plural + '.js');
+    const start = source.indexOf('    loadSelect' + cap + 'State: function');
+    const end = source.indexOf('    validForm:', start);
+    const dom = new JSDOM('<select id="' + kind + '_state"></select>', { runScripts: 'outside-only' });
+    const w = dom.window;
+    w.eval(read('frontend/static/script/js/jquery.min.js'));
+    const callbacks = [];
+    const saved = { state_setting: 'Tamil Nadu', ['edit_' + kind + '_state']: 'Karnataka' };
+    w.PosnicPro = { local: { get: k => saved[k] }, get: (params, done) => callbacks.push(done), [plural]: {} };
+    const method = w.eval('({' + source.slice(start, end) + '})')['loadSelect' + cap + 'State'];
+    const result = states => ({ data: { stateJsonArray: states, countrySortName: 'in' } });
+    method('IN', 'add'); callbacks.shift()(result(['Andaman', 'Tamil Nadu', 'Karnataka']));
+    assert.equal(w.document.querySelector('select').value, 'Tamil Nadu');
+    method('IN', 'edit'); callbacks.shift()(result(['Tamil Nadu', 'Karnataka']));
+    assert.equal(w.document.querySelector('select').value, 'Karnataka');
+    method('IN', 'clear'); method('GB', 'onChange');
+    const stale = callbacks.shift(); callbacks.shift()(result(['England'])); stale(result(['Tamil Nadu']));
+    assert.equal(w.document.querySelector('select').value, '');
+    assert.equal(w.document.querySelectorAll('option').length, 2);
+    assert.equal(w.document.querySelectorAll('option')[1].value, 'England');
+    dom.window.close();
+  });
+}
diff --git a/tests/sales-customer-popup.test.js b/tests/sales-customer-popup.test.js
new file mode 100644
index 000000000..133524cb5
--- /dev/null
+++ b/tests/sales-customer-popup.test.js
@@ -0,0 +1,41 @@
+const test=require('node:test');
+const assert=require('node:assert/strict');
+const fs=require('node:fs');
+const {JSDOM}=require('jsdom');
+const jquery=require('jquery');
+const source=fs.readFileSync('frontend/static/script/js/modules/js/sales.js','utf8');
+function setup(){
+ const dom=new JSDOM(fs.readFileSync('frontend/modules/sales_write.html','utf8'),{runScripts:'outside-only'});
+ const w=dom.window,$=jquery(w);w.$=$;
+ const calls=[];
+ w.PosnicPro={i18n:{t(key,fallback){return fallback;}},sales:{renderRecentCustomers(){},updateCustomerChip(){},applyCustomerPick(d){calls.push(d);}},request(p,ok,fail){calls.push({p,ok,fail});}};
+ const a=source.indexOf('PosnicPro.sales.setCustomerPopup =');
+ w.eval(source.slice(a,source.indexOf('// Customer popover:',a)));
+ return {dom,w,$,calls};
+}
+test('customer icon shares the search row and opens one popup with focus and Escape dismissal',()=>{
+ const {dom,w,$}=setup();try{
+ assert.equal($('#sales_customer_btn').closest('.sales-search-toolbar').find('#sales_new_item_name').length,1);
+ assert.equal($('#sales_customer_popup #sales_new_customer_name').length,1);
+ $('#sales_customer_btn').trigger('click');assert.equal($('#sales_customer_btn').attr('aria-expanded'),'true');
+ assert.equal(w.document.activeElement.id,'sales_new_customer_name');
+ $('#sales_new_customer_name').trigger($.Event('keydown',{key:'Escape'}));
+ assert.equal($('#sales_customer_btn').attr('aria-expanded'),'false');assert.equal(w.document.activeElement.id,'sales_customer_btn');
+ }finally{dom.window.close();}
+});
+test('inline customer creation prevents double submission, reports failures, and selects successful record',()=>{
+ const {dom,$,calls}=setup();try{
+ $('#sales_new_customer_name').val('New customer');$('#sales_new_customer_phone').val('9876543210');
+ $('#sales_customer_add_new').trigger('click').trigger('click');assert.equal(calls.length,1);
+ assert.equal(calls[0].p.url,'customers');assert.equal(JSON.parse(calls[0].p.data).name,'New customer');
+ calls[0].fail({responseJSON:{message:'Phone already exists'}});assert.match($('#sales_customer_status').text(),/Phone already exists/);
+ assert.equal($('#sales_customer_add_new').prop('disabled'),false);
+ $('#sales_customer_add_new').trigger('click');calls[1].ok({type:'success',data:{customer_id:'abc',name:'New customer'}});
+ assert.equal(calls[2].id,'abc');assert.equal($('#sales_customer_btn').attr('aria-expanded'),'false');
+ }finally{dom.window.close();}
+});
+test('saving an already linked customer cannot create a duplicate',()=>{
+ const {dom,$,calls}=setup();try{
+ $('#sales_new_customer_name').val('Existing');$('#sales_new_customer_id').val('abc');$('#sales_customer_add_new').trigger('click');assert.equal(calls.length,0);
+ }finally{dom.window.close();}
+});
diff --git a/tests/which-version-is-this-shop-running.test.js b/tests/which-version-is-this-shop-running.test.js
index 7792022af..e90bfbd09 100644
--- a/tests/which-version-is-this-shop-running.test.js
+++ b/tests/which-version-is-this-shop-running.test.js
@@ -192,27 +192,10 @@ test('the About window can be opened without knowing about the Alt key', async (
   assert.match(body, /case 'about': openAboutWindow\(\); break;/,
     'About cannot be opened from inside the app');
 
-  const dash = fs.readFileSync(path.join(ROOT, 'frontend', 'dashboard.html'), 'utf8');
-  const dashboard = new JSDOM(dash);
-  t.after(() => dashboard.window.close());
-  const script = [...dashboard.window.document.scripts]
-    .map(element => element.textContent).find(code => code.includes('Desktop tools quick-access'));
-  assert.ok(script, 'the desktop quick menu is missing');
-  const dom = new JSDOM('', { url: 'https://shop.example/', runScripts: 'outside-only' });
-  t.after(() => dom.window.close());
-  const w = dom.window, opened = [];
-  w.PosnicPro = { i18n: { t: (_key, fallback) => fallback }, local: { get: () => false } };
-  w.electronAPI = { desktop: { capabilities: async () => ({ backup: true }), open: target => opened.push(target) } };
-  w.eval(script);
-  await settled();
-  const trigger = w.document.querySelector('.fab-btn');
-  trigger.click();
-  assert.equal(trigger.getAttribute('aria-expanded'), 'true');
-  const about = [...w.document.querySelectorAll('[role="menuitem"]')].find(button => button.textContent === 'About Posnic');
-  assert.ok(about, 'nothing on screen opens About');
-  about.click();
-  assert.deepEqual(opened, ['about']);
-  assert.equal(trigger.getAttribute('aria-expanded'), 'false');
+  const about = new JSDOM(ABOUT);
+  t.after(() => about.window.close());
+  assert.ok(about.window.document.querySelector('[data-target="#posnic_about_dialog"]'),
+    'About must remain reachable from the app footer');
 });
 
 test('the badge rides both bundles, or it is on neither page', () => {