Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -r2fc811482a7453b22c2a1d650b06e83869f35670
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 2fc811482a7453b22c2a1d650b06e83869f35670)
@@ -75,6 +75,7 @@
     readonly property bool visibleLocalization          :                           loggedIn
     readonly property bool visibleAdvancedModes         :                           loggedIn
     readonly property bool visibleCalibrationSettings   :                           loggedIn
+    readonly property bool visibleServiceMode           :        true//                   loggedIn
 
     readonly property string settingsTitle              : _GuiView.manufactSetup ? qsTr("Manufacturing Setup")  : _GuiView.updateSetup
                                                                                  ? qsTr("Software Update")      : qsTr("Device Settings")
@@ -102,8 +103,10 @@
         FeatureConfigurations   ,
         AdvancedMode            ,
         CalibrationSettings     ,
+        ServiceMode             ,
         Home
     }
+
     property var itemsText  : [
         qsTr("Device Information"               ), // Device Information
         qsTr("Display and Volume"               ), // VolumeBrightness
@@ -127,6 +130,7 @@
         qsTr("Feature Configurations"           ), // FeatureConfigurations
         qsTr("Advanced Mode"                    ), // Advanced Modes
         qsTr("Calibration Settings"             ), // Calibration Settings
+        qsTr("Service Mode Calibrations"        ), // Service Mode Calibrations
         settingsTitle                            , // settings home
     ]
 
@@ -153,14 +157,14 @@
         visibleFeatureConfigurations        , // FeatureConfigurations
         visibleAdvancedModes                , // Advanced Modes
         visibleCalibrationSettings          , // Calibration Settings
+        visibleServiceMode                  , // Service Mode
         false                               , // leave last and false align with settings home
     ]
 
     // TODO: SRS 405/406 Test Mode instead add Q_PROPERTY to monitor state???
     onServiceModeChanged:  _headerBar.userMode = serviceMode ? "Service" : ""
 
     SettingsHome { id   : _settingsHome
-        itemIndex       : SettingsStack.Home
         backVisible     : false
         //TODO  on graceful shutdown, the applicaiton quit shall be used for any applicaiton termination
         //      and needs to be distinguished between the QUIT or SHUTDOWN touch,
@@ -268,33 +272,43 @@
                 push( _settingCalibrationSettings )
                 break
 
+            case SettingsStack.ServiceMode:
+                push(_settingServiceMode)
+                break
+
             default:
                 console.debug("Unknown Index", vIndex)
                 break
             }
         }
     }
 
-    SettingsInformation             { id: _settingsInformation          }
-    SettingsVolumeBrightness        { id: _settingsVolumeBrightness     }
-    SettingsWiFi                    { id: _settingsWiFi                 }
-    SettingsDGCleaning              { id: _settingsDGCleaning           }
-    SettingsDGScheduling            { id: _settingsDGScheduling         }
-    SettingsServicePassword         { id: _servicePassword              }
-    SettingsDateTime                { id: _settingsDateTime             }
-    SettingsExportLogs              { id: _settingsExportLogs           }
-    SettingsROInput                 { id: _settingsRoInput              }
-    SettingsManufacturingSetup      { id: _settingsDeviceConfiguration  }
-    SettingsDeviceRegistration      { id: _settingsDeviceRegistration   }
-    SettingsRootSSHAccess           { id: _SettingsRootSSHAccess        }
-    SettingsFactoryReset            { id: _serviceFactoryReset          }
-    SettingsDecommission            { id: _serviceDecommission          }
-    SettingsInstitutionalRecord     { id: _settingsInstitutionalRecord  }
-    SettingsAdvancedInstitutional   { id: _settingsAdvancedInstitutional}
-    SettingsLocalization            { id: _settingLocalization          }
-    SettingsFeatureConfigurations   { id: _settingsFeatureConfigurations}
-    SettingsAdvancedMode            { id: _settingAdvancedMode          }
-    SettingsCalibrationSettings     { id: _settingCalibrationSettings   }
+    SettingsInformation             { id: _settingsInformation                              }
+    SettingsVolumeBrightness        { id: _settingsVolumeBrightness                         }
+    SettingsWiFi                    { id: _settingsWiFi                                     }
+    SettingsDGCleaning              { id: _settingsDGCleaning                               }
+    SettingsDGScheduling            { id: _settingsDGScheduling                             }
+    SettingsServicePassword         { id: _servicePassword                                  }
+    SettingsDateTime                { id: _settingsDateTime                                 }
+    SettingsExportLogs              { id: _settingsExportLogs                               }
+    SettingsROInput                 { id: _settingsRoInput                                  }
+    SettingsManufacturingSetup      { id: _settingsDeviceConfiguration                      }
+    SettingsDeviceRegistration      { id: _settingsDeviceRegistration                       }
+    SettingsRootSSHAccess           { id: _SettingsRootSSHAccess                            }
+    SettingsFactoryReset            { id: _serviceFactoryReset                              }
+    SettingsDecommission            { id: _serviceDecommission                              }
+    SettingsInstitutionalRecord     { id: _settingsInstitutionalRecord                      }
+    SettingsAdvancedInstitutional   { id: _settingsAdvancedInstitutional                    }
+    SettingsLocalization            { id: _settingLocalization                              }
+    SettingsFeatureConfigurations   { id: _settingsFeatureConfigurations                    }
+    SettingsAdvancedMode            { id: _settingAdvancedMode                              }
+    SettingsCalibrationSettings     { id: _settingCalibrationSettings                       }
+    SettingsServiceModeStack        { id: _settingServiceMode;
+        onBackClicked: {
+            _root.pop()
+            _headerBar.activeStack = _root.stackView
+        }
+    }
 
     function gotoServiceMode( vservice ) {
         //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth)