Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r7e503c5459ec77a2816d6c7789da9b206cedbe8a
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 7e503c5459ec77a2816d6c7789da9b206cedbe8a)
@@ -56,8 +56,8 @@
         qsTr("Volume And Brightness"        ), // VolumeBrightness
         qsTr("Wi-Fi"                        ), // WiFi
         qsTr("Bluetooth Cuff"               ), // Bluetooth
-        qsTr("Dialysate Generator Settings" ), // DGSettings
-        qsTr("Services"                     ), // Services
+        qsTr("DG Cleaning"                  ), // DGSettings
+        qsTr("Service"                      ), // Service
         qsTr("Set Date And Time"            ), // SetDateTime
         qsTr("Set Language"                 ), // Language
         qsTr("Calibration "                 ), // Calibration
@@ -85,10 +85,10 @@
         true                                 , // DGSettings
       ! serviceMode                          , // Services
         serviceMode                          , // SetDateTime
-        serviceMode                          , // Language
-        serviceMode                          , // Calibration
-        serviceMode                          , // SWUpdate
-        serviceMode                          , // FactoryReset
+        false /* serviceMode phase 1 */      , // Language
+        false /* serviceMode phase 1 */      , // Calibration
+        false /* serviceMode phase 1 */      , // SWUpdate
+        false /* serviceMode phase 1 */      , // FactoryReset
     ]
 
     SettingsBase                { id: _settingsInformation
@@ -142,7 +142,7 @@
                 qsTr("DG FPGA Version"      ),
                 qsTr("DG Serial Number"     ),
 
-                qsTr("Services"             ), // col2 title
+                qsTr("Service"              ), // col2 title
                 qsTr("HD Last Service Date" ),
                 qsTr("HD Next Service Date" ),
                 qsTr("DG Last Service Date" ),
@@ -173,7 +173,7 @@
 
     UserConfirmation            { id: _servicePassword
         itemIndex : SettingsStack.Services
-        title     : qsTr("Please Enter The Service Password")
+        title     : qsTr("Service Password")
         isPassword: true
         onBackClicked   : {
             clearPassword()
@@ -198,6 +198,7 @@
     }
 
     SettingsHome { id   : _settingsHome
+        title           : serviceMode ? qsTr("Service") : qsTr("Device Settings")
         backVisible     : false
         confirmVisible  : serviceMode
         confirmText.text: qsTr("SHUTDOWN")