Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3caffb866d4c84ac6282dcd36fc2d8f7cad9584d
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 3caffb866d4c84ac6282dcd36fc2d8f7cad9584d)
@@ -14,12 +14,13 @@
  */
 
 // Qt
-import QtQuick 2.12
+import QtQuick                  2.12
 
 // Project
 import Gui.Actions 0.1
 
 //  Qml imports
+import "qrc:/"
 import "qrc:/globals"
 import "qrc:/components"
 import "qrc:/compounds"
@@ -46,6 +47,7 @@
         DGSettings      ,
         Services        ,
         SetDateTime     ,
+        ExportLogs      ,
         Language        ,
         Calibration     ,
         SWUpdate        ,
@@ -56,9 +58,10 @@
         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("Export Logs"                  ), // ExportLogs
         qsTr("Set Language"                 ), // Language
         qsTr("Calibration "                 ), // Calibration
         qsTr("Software Update"              ), // SWUpdate
@@ -72,6 +75,7 @@
         true                                 , // DGSettings
         true                                 , // Services
         true                                 , // SetDateTime
+        true                                 , // ExportLogs
         false                                , // Language
         false                                , // Calibration
         false                                , // SWUpdate
@@ -85,19 +89,76 @@
         true                                 , // DGSettings
       ! serviceMode                          , // Services
         serviceMode                          , // SetDateTime
-        serviceMode                          , // Language
-        serviceMode                          , // Calibration
-        serviceMode                          , // SWUpdate
-        serviceMode                          , // FactoryReset
+        true                                 , // ExportLogs
+        false /* serviceMode phase 1 */      , // Language
+        false /* serviceMode phase 1 */      , // Calibration
+        false /* serviceMode phase 1 */      , // SWUpdate
+        false /* serviceMode phase 1 */      , // FactoryReset
     ]
 
+    SettingsHome { id   : _settingsHome
+        title           : serviceMode ? qsTr("Service") : qsTr("Device Settings")
+        backVisible     : false
+        confirmVisible  : serviceMode
+        confirmText.text: qsTr("SHUTDOWN")
+        onConfirmClicked: _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData)
+        itemsText       : _root.itemsText
+        itemsEnabled    : _root.itemsEnabled
+        itemsVisible    : _root.itemsVisible
+        onItemClicked   : {
+            switch (vIndex) {
+            case SettingsStack.Information:
+                push(_settingsInformation)
+                break
+
+            case SettingsStack.VolumeBrightness:
+                vDevice.doInitBrightness()
+                push(_settingsVolumeBrightness)
+                break
+
+            case SettingsStack.WiFi:
+                vNetwork.doInit()
+                push( _settingsWiFi )
+                // _settingsWiFi.setFocus() // No keyboard popup.
+                break
+
+            case SettingsStack.Bluetooth:
+                push( _settingsBluetooth )
+                break
+
+            case SettingsStack.DGSettings:
+                push( _settingsDGSettings )
+                break
+
+            case SettingsStack.Services:
+                push(_servicePassword)
+                _servicePassword.setFocus()
+                break
+
+            case SettingsStack.SetDateTime:
+                vDateTime.doInit()
+                push( _settingsDateTime )
+                _settingsDateTime.setFocus()
+                break
+
+            case SettingsStack.ExportLogs:
+                push( _settingsExportLogs )
+                break
+
+            default:
+                console.debug("Unknown Index", vIndex)
+                break
+            }
+        }
+    }
+
     SettingsBase                { id: _settingsInformation
         itemIndex       : SettingsStack.Information
         confirmVisible  : false
         onVisibleChanged: {
             if ( visible ) {
-                vAdjustmentVersions.doAdjustment()
-                vAdjustmentService .doAdjustment()
+                vAdjustmentVersions     .doAdjustment()
+                vAdjustmentServiceDates .doAdjustment()
             }
         }
 
@@ -116,21 +177,21 @@
                 0, // title C2
                 1,1,1,1,
             ]
-            itemsValueLeftMargin: 350
+            itemsValueLeftMargin: 300
             itemsValue  : [
-                ""                                      ,
-                Qt.application.version                  ,
-                vAdjustmentVersions.hdVerDevice         ,
-                vAdjustmentVersions.hdVerFPGA           ,
-                vAdjustmentVersions.hdSerial            ,
-                vAdjustmentVersions.dgVerDevice         ,
-                vAdjustmentVersions.dgVerFPGA           ,
-                vAdjustmentVersions.dgSerial            ,
+                ""                                          ,
+                Qt                      .application.version,
+                vAdjustmentVersions     .hdVerDevice        ,
+                vAdjustmentVersions     .hdVerFPGA          ,
+                vAdjustmentVersions     .hdSerial           ,
+                vAdjustmentVersions     .dgVerDevice        ,
+                vAdjustmentVersions     .dgVerFPGA          ,
+                vAdjustmentVersions     .dgSerial           ,
                 "",
-                vAdjustmentService.hdLastServiceDate    ,
-                vAdjustmentService.hdNextServiceDate    ,
-                vAdjustmentService.dgLastServiceDate    ,
-                vAdjustmentService.dgNextServiceDate    ,
+                vAdjustmentServiceDates .hdLastServiceDate  ,
+                vAdjustmentServiceDates .hdNextServiceDate  ,
+                vAdjustmentServiceDates .dgLastServiceDate  ,
+                vAdjustmentServiceDates .dgNextServiceDate  ,
             ]
             itemsText   : [
                 qsTr("Versions"             ), // col1 title
@@ -142,7 +203,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" ),
@@ -153,27 +214,31 @@
     }
 
     SettingsVolumeBrightness    { id: _settingsVolumeBrightness
-        itemIndex : SettingsStack.VolumeBrightness
+        itemIndex               : SettingsStack.VolumeBrightness
     }
 
     SettingsDateTime            { id: _settingsDateTime
-        itemIndex : SettingsStack.SetDateTime
+        itemIndex               : SettingsStack.SetDateTime
     }
 
     SettingsWiFi                { id: _settingsWiFi
-        itemIndex : SettingsStack.WiFi
+        itemIndex               : SettingsStack.WiFi
     }
 
     SettingsBluetoothCuff       { id: _settingsBluetooth
     }
 
     SettingsDG                  { id: _settingsDGSettings
-        itemIndex : SettingsStack.DGSettings
+        itemIndex               : SettingsStack.DGSettings
     }
 
+    SettingsExportLogs          { id: _settingsExportLogs
+        itemIndex               : SettingsStack.ExportLogs
+    }
+
     UserConfirmation            { id: _servicePassword
         itemIndex : SettingsStack.Services
-        title     : qsTr("Please Enter The Service Password")
+        title     : qsTr("Service Password")
         isPassword: true
         onBackClicked   : {
             clearPassword()
@@ -186,7 +251,7 @@
             else {
                 if ( password === vSettings.settings["Service Password"].keys[0] ) {
                     _settingsHome.notificationText = ""
-                    serviceMode = true
+                    vAdjustmentServiceMode.doAdjustment()
                 }
                 else {
                     _settingsHome.notificationText = qsTr("Incorrect service password")
@@ -197,60 +262,31 @@
         }
     }
 
-    SettingsHome { id   : _settingsHome
-        backVisible     : false
-        confirmVisible  : serviceMode
-        confirmText.text: qsTr("SHUTDOWN")
-        onConfirmClicked: _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData)
-        itemsText       : _root.itemsText
-        itemsEnabled    : _root.itemsEnabled
-        itemsVisible    : _root.itemsVisible
-        onItemClicked   : {
-            switch (vIndex) {
-            case SettingsStack.Information:
-                push(_settingsInformation)
-                break
-
-            case SettingsStack.VolumeBrightness:
-                vDevice.doInitBrightness()
-                push(_settingsVolumeBrightness)
-                break
-
-            case SettingsStack.SetDateTime:
-                vDateTime.doInit()
-                push( _settingsDateTime )
-                _settingsDateTime.setFocus()
-                break
-
-            case SettingsStack.WiFi:
-                vNetwork.doInit()
-                push( _settingsWiFi )
-                // _settingsWiFi.setFocus() // No keyboard popup.
-                break
-
-            case SettingsStack.Bluetooth:
-                push( _settingsBluetooth )
-                break
-
-            case SettingsStack.DGSettings:
-                push( _settingsDGSettings )
-                break
-
-            case SettingsStack.Services:
-                push(_servicePassword)
-                _servicePassword.setFocus()
-                break
-
-            default:
-                console.debug("Unknown Index", vIndex)
-                break
+    Connections { target: vAdjustmentServiceMode
+        onAdjustmentTriggered   : {
+            if ( vAdjustmentServiceMode.adjustment_Accepted ) {
+                _settingsHome.notificationText = ""                
             }
+            else {
+                _settingsHome.notificationText = vAdjustmentServiceMode.text()
+            }
         }
     }
 
+    Connections { target: vHDOperationMode
+        onServiceChanged                : { push( _settingsHome                    , vservice                  )
+            serviceMode      = vservice
+            if ( vservice )
+                _mainMenu.hidden = true
+            else
+                if ( _settingsHome.visible )
+                    _mainMenu.hidden = false
+        }
+    }
+
     onVisibleChanged: {
         if (visible) {
-            _mainMenu.hidden = false
+            _mainMenu.hidden = serviceMode
         }
         else {
             stackView.initialItem = null