Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -r3d0a160e4e8c0348c688ed5efe4d86dc66121e6b -rfeb7724c8a7a2932650c5daa490c90923c9fbe77
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 3d0a160e4e8c0348c688ed5efe4d86dc66121e6b)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision feb7724c8a7a2932650c5daa490c90923c9fbe77)
@@ -28,7 +28,24 @@
  * which is the default screen in the "Settings" stack
  */
 ScreenItem { id: _root
-    backgroundRect.color: Colors.backgroundMenu
+
+    TouchRect { id : _clearAlarmCondition
+        objectName: "_clearAlarmCondition"
+        width: 300
+        height: Variables.logoHeight
+        animated: true
+        anchors {
+            top         : parent.top
+            right       : _usbButton.left
+            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
+            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
+        }
+        text.text: qsTr("Clear Alarm Condition")
+        button.onClicked: {
+            vAlarmStatus.doClearCondition();
+        }
+    }
+
     USBButton { id: _usbButton
         anchors {
             top         : parent.top
@@ -65,49 +82,30 @@
         }
     }
 
-    TouchRect { id : _endTreatmentButton
-        objectName: "_endTreatmentButton"
-        width: 200
-        height: Variables.logoHeight
-        animated: true
+    TitleText { id: _titleText
         anchors {
-            top         : parent.top
-            right       : _usbButton.left
-            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
-            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
+            horizontalCenter: parent.horizontalCenter;
+            top: parent.top
+            topMargin: 150
         }
-        text.text: qsTr("End Treatment")
-        button.onPressed: {
-            vTreatmentEnd.doEndTreatmentRequest();
-        }
+
+        width: parent.width
+        text: qsTr("Device Settings")
     }
 
-    TouchRect { id : _clearAlarmCondition
-        objectName: "_clearAlarmCondition"
-        width: 300
-        height: Variables.logoHeight
-        animated: true
+    TitleText {
         anchors {
-            top         : parent.top
-            right       : _endTreatmentButton.left
-            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
-            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
+            horizontalCenter: parent.horizontalCenter
+            top: _titleText.bottom
+            topMargin: 10
         }
-        text.text: qsTr("Clear Alarm Condition")
-        button.onPressed: {
-            vAlarmStatus.doClearCondition();
-        }
+        text: qsTr("Service Mode")
+        color: Colors.textMain
+        font.italic: true
+        font.pixelSize: Fonts.fontPixelDialogText
+        visible: vServiceMode.isServiceMode
     }
 
-    TitleText { id: _titleText
-        anchors.horizontalCenter: parent.horizontalCenter;
-        anchors.top: parent.top
-        anchors.topMargin: 150
-
-        width: parent.width
-        text: qsTr("Device Settings")
-    }
-
     /*
     Diagnostics {
         id: _diagnostics
@@ -117,20 +115,79 @@
 
     SettingsBluetooth {
         id: _bluetooth
-        onClickedBack: pop()
+        onClickedBack: _settingsStack.pop()
 
     }
 
+    SettingsWifi {
+        id: _wifi
+        onClickedBack: _settingsStack.pop()
+
+    }
+
+    SettingsDeviceInformation {
+        id: _deviceInformation
+        onClickedBack: _settingsStack.pop()
+    }
+
+    SettingsDateTimeSet {
+        id: _dateTimeSet
+        onClickedBack: _settingsStack.pop()
+    }
+
     Column {
-        anchors.centerIn: parent;
+        anchors.centerIn: parent
+        SettingsItem { id: _item_
+            title   : qsTr("Device Information")
+            onClicked: {
+                vDeviceInformation.doRequestHDDGVersions()
+                vDeviceInformation.doRequestServiceData()
+                _settingsStack.push(_deviceInformation)
+            }
+        }
 
-        // add each settings page here.
         SettingsItem { id: _item_bluetooth
             title   : qsTr("Bluetooth")
-            onClicked: push(_bluetooth);
+            onClicked: _settingsStack.push(_bluetooth);
 
         }
+        SettingsItem { id: _item_wifi
+            title   : qsTr("Wifi")
+            onClicked: {
+                _settingsStack.push(_wifi);
+                vNetworkModel.doScan()
+            }
+        }
+        SettingsItem { id: _item_serviceMode
+            title   : qsTr("Service Mode")
+            onClicked: {
+                _serviceLogin.visible = true
+            }
+            visible: !vServiceMode.isServiceMode
+        }
+        SettingsItem { id: _itemDateTimeSet
+            title   : qsTr("Set Date and Time")
+            onClicked: {
+                vDateTime.doGetCurrentTime()
+                push(_dateTimeSet)
+            }
+        }
     }
-}
 
-
+    TouchRect { id: _scan
+        anchors {
+            bottom: _root.bottom
+            bottomMargin: Variables.settingsMargin
+            horizontalCenter: _root.horizontalCenter
+        }
+        visible: vServiceMode.isServiceMode
+        backgroundColor: Colors.backgroundButtonNormal
+        textColor: Colors.textMain
+        height: Variables.settingsButtonHeight
+        width: Variables.settingsButtonWidth
+        text.text: qsTr("Shutdown")
+        onClicked: {
+            _powerOffDialog.open()
+        }
+    }
+}