Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -rbf9223700613ced6c377f3e3a7b4de8367c30474 -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision bf9223700613ced6c377f3e3a7b4de8367c30474)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd)
@@ -62,7 +62,7 @@
     //                                                  if works it is a better approach better.
     readonly property bool visibleServicePassword       : ( normalMode          && ! loggedIn ) // || ( onlyUpdating &&    ! loggedIn )
     readonly property bool visibleDGCleaning            :   normalMode
-    readonly property bool visibleRoInput               :   normalMode
+    readonly property bool visibleRoInput               :   onlyManufacturing   &&  loggedIn
     readonly property bool visibleRootSSHAccess         :                           loggedIn
     readonly property bool visibleFactoryReset          :                           loggedIn
     readonly property bool visibleDecommission          :   false   // TODO: Not Yet Defined
@@ -99,11 +99,12 @@
         InstitutionalRecord     ,
         AdvancedInstitutional   ,
         FeatureConfigurations   ,
-        AdvancedMode
+        AdvancedMode            ,
+        Home
     }
     property var itemsText  : [
         qsTr("Device Information"               ), // Device Information
-        qsTr("Volume And Brightness"            ), // VolumeBrightness
+        qsTr("Display and Volume"               ), // VolumeBrightness
         qsTr("Wi-Fi"                            ), // WiFi
         qsTr("Device Cleaning"                  ), // DGCleaning
         qsTr("DG Scheduling"                    ), // DGScheduling
@@ -123,6 +124,7 @@
         qsTr("Advanced Institutional Settings"  ), // AdvancedInstitutional
         qsTr("Feature Configurations"           ), // FeatureConfigurations
         qsTr("Advanced Mode"                    ), // Advanced Modes
+        settingsTitle                            , // settings home
     ]
 
     property var itemsVisible  : [
@@ -147,33 +149,30 @@
         visibleAdvancedInstitutional        , // AdvancedInstitutional
         visibleFeatureConfigurations        , // FeatureConfigurations
         visibleAdvancedModes                , // Advanced Modes
+        false                               , // leave last and false align with settings home
     ]
 
     // TODO: SRS 405/406 Test Mode instead add Q_PROPERTY to monitor state???
-    onServiceModeChanged:  _headerBar.loggedUser = serviceMode ? "[Service]" : ""
+    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,
         //      to know whether to run the lockdown scropt or just quit the app.
-        confirmVisible  : serviceMode           || _GuiView.updateMode
-        confirmText.text: _GuiView.manufactMode || _GuiView.updateMode  ? qsTr("COMPLETE") : qsTr("SHUTDOWN")
-        onConfirmClicked: {
-            if ( _GuiView.manufactSetup || _GuiView.updateSetup ) {
-                _GuiView.doQuitApplication()
-            }
-            else {
-                _GuiView.doActionTransmit(guiActions.ID_PowerOff, guiActions.NoData)
-            }
-        }
+        confirmVisible  : _GuiView.manufactMode || _GuiView.updateMode
+        confirmText.text:  qsTr("COMPLETE")
         itemsText       : _root.itemsText
         itemsVisible    : _root.itemsVisible
+
+        onConfirmClicked: _GuiView.doQuitApplication()
+
         onItemClicked   : {
             _root.currentItem = vIndex
             vDevice.status = ""
-            _headerBar.titleText = itemsText[vIndex]
             switch (vIndex) {
+
             case SettingsStack.Information:
                 vAdjustmentVersions     .doAdjustment()
                 vAdjustmentServiceDates .doAdjustment()
@@ -286,7 +285,7 @@
     SettingsAdvancedInstitutional   { id: _settingsAdvancedInstitutional}
     SettingsLocalization            { id: _settingLocalization          }
     SettingsFeatureConfigurations   { id: _settingsFeatureConfigurations}
-    SettingsAdvancedMode        { id: _settingAdvancedMode          }
+    SettingsAdvancedMode            { id: _settingAdvancedMode          }
 
     function gotoServiceMode( vservice ) {
         //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth)
@@ -339,11 +338,10 @@
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = _GuiView.manufactSetup
-            _headerBar.titleText = _root.settingsTitle
+            _headerBar.activeStack = stackView
         }
         else {
             stackView.initialItem = null
-            _headerBar.titleText = ""
         }
     }
 }