diff --git a/src/Pages/Preference/PreferenceList.jsx b/src/Pages/Preference/PreferenceList.jsx
index 614f123..abddc94 100644
--- a/src/Pages/Preference/PreferenceList.jsx
+++ b/src/Pages/Preference/PreferenceList.jsx
@@ -471,10 +471,6 @@ const PreferenceList = () => {
                 'dashboard',
                 'Stay on the Dashboard when you open the app?'
               )}
-              {renderCheckbox(
-                'shortcutkeys',
-                'Would you like to enable the shortcut keys?'
-              )}
               {renderCheckbox(
                 'autoreceivestock',
                 'Items received from godown. Add to stock Automatically ?'
@@ -483,44 +479,6 @@ const PreferenceList = () => {
                 'decimal',
                 'Display values with 2 decimal places throughout the app?'
               )}
-
-              {((allSettingsMap['dinein'] !== undefined && dinePreference) ||
-                allSettingsMap['estimation'] !== undefined) && (
-                <Form.Item
-                  name="enabledModules"
-                  label="Select the modules you want to enable:"
-                >
-                  <Checkbox.Group>
-                    {allSettingsMap['dinein'] !== undefined &&
-                      dinePreference && (
-                        <Checkbox value="dinein">Dine-In</Checkbox>
-                      )}
-                    {allSettingsMap['estimation'] !== undefined && (
-                      <Checkbox value="estimation">Estimation</Checkbox>
-                    )}
-                  </Checkbox.Group>
-                </Form.Item>
-              )}
-              {(allSettingsMap['onbilltime'] !== undefined ||
-                allSettingsMap['1daybefore'] !== undefined ||
-                allSettingsMap['1hourbefore'] !== undefined) && (
-                <Form.Item
-                  name="notification"
-                  label="Choose notification timing:"
-                >
-                  <Checkbox.Group>
-                    {allSettingsMap['onbilltime'] !== undefined && (
-                      <Checkbox value="onbilltime">On Bill Time</Checkbox>
-                    )}
-                    {allSettingsMap['1daybefore'] !== undefined && (
-                      <Checkbox value="1daybefore">1 Day Before</Checkbox>
-                    )}
-                    {allSettingsMap['1hourbefore'] !== undefined && (
-                      <Checkbox value="1hourbefore">1 Hour Before</Checkbox>
-                    )}
-                  </Checkbox.Group>
-                </Form.Item>
-              )}
               {(allSettingsMap['onlineindividualslots'] !== undefined ||
                 allSettingsMap['allow individual booking'] !== undefined ||
                 allSettingsMap['single booking only'] !== undefined) && (
@@ -571,6 +529,26 @@ const PreferenceList = () => {
                 'notificationblink',
                 'Do you want to enable the low-stock blink notification?'
               )}
+              {(allSettingsMap['onbilltime'] !== undefined ||
+                allSettingsMap['1daybefore'] !== undefined ||
+                allSettingsMap['1hourbefore'] !== undefined) && (
+                <Form.Item
+                  name="notification"
+                  label="Choose notification timing:"
+                >
+                  <Checkbox.Group>
+                    {allSettingsMap['onbilltime'] !== undefined && (
+                      <Checkbox value="onbilltime">On Bill Time</Checkbox>
+                    )}
+                    {allSettingsMap['1daybefore'] !== undefined && (
+                      <Checkbox value="1daybefore">1 Day Before</Checkbox>
+                    )}
+                    {allSettingsMap['1hourbefore'] !== undefined && (
+                      <Checkbox value="1hourbefore">1 Hour Before</Checkbox>
+                    )}
+                  </Checkbox.Group>
+                </Form.Item>
+              )}
             </div>
 
             <div
@@ -586,6 +564,10 @@ const PreferenceList = () => {
                 Sales Page
               </div>
               {renderCheckbox('searchfocus', 'Always focus the search bar?')}
+               {renderCheckbox(
+                'shortcutkeys',
+                'Would you like to enable the shortcut keys?'
+              )}
               {renderCheckbox(
                 'addproductcard',
                 'Would you like to remove Add Product card from sales page ?'
@@ -607,6 +589,23 @@ const PreferenceList = () => {
                   </Checkbox.Group>
                 </Form.Item>
               )}
+                {((allSettingsMap['dinein'] !== undefined && dinePreference) ||
+                allSettingsMap['estimation'] !== undefined) && (
+                <Form.Item
+                  name="enabledModules"
+                  label="Select the modules you want to enable:"
+                >
+                  <Checkbox.Group>
+                    {allSettingsMap['dinein'] !== undefined &&
+                      dinePreference && (
+                        <Checkbox value="dinein">Dine-In</Checkbox>
+                      )}
+                    {allSettingsMap['estimation'] !== undefined && (
+                      <Checkbox value="estimation">Estimation</Checkbox>
+                    )}
+                  </Checkbox.Group>
+                </Form.Item>
+              )}
 
               {renderCheckbox('stockselection', 'Enable stock selection?')}
               {renderCheckbox('weightasquantity', 'Use Weight as Quantity?')}
@@ -628,6 +627,7 @@ const PreferenceList = () => {
                 'customisedbillnumber',
                 'Do you Want Customised Bill Number?'
               )}
+               {renderCheckbox('scanlayout', 'Do you Want Scan Layout Page?')}
               {renderCheckbox('upiqr', 'Do you want to show the UPI QR code?')}
               {/* {renderCheckbox('editbill', 'Do you want to edit the previously created bill?')} */}
             </div>
@@ -750,7 +750,6 @@ const PreferenceList = () => {
                 'Do you want to include a header when printing Estimate bills?'
               )}
 
-              {renderCheckbox('scanlayout', 'Do you Want Scan Layout Page?')}
             </div>
             <div className="PreferencesBTN">
               <Buttons