Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -rd1a6830c486a9ee9c388a80b570aa8141a8366c9 -r96b249bba7de97afe17cfbdaf02250dbded38f4b
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision d1a6830c486a9ee9c388a80b570aa8141a8366c9)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 96b249bba7de97afe17cfbdaf02250dbded38f4b)
@@ -83,14 +83,29 @@
     }
 
     TitleText { id: _titleText
-        anchors.horizontalCenter: parent.horizontalCenter;
-        anchors.top: parent.top
-        anchors.topMargin: 150
+        anchors {
+            horizontalCenter: parent.horizontalCenter;
+            top: parent.top
+            topMargin: 150
+        }
 
         width: parent.width
         text: qsTr("Device Settings")
     }
 
+    TitleText {
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            top: _titleText.bottom
+            topMargin: 10
+        }
+        text: qsTr("Service Mode")
+        color: Colors.textMain
+        font.italic: true
+        font.pixelSize: Fonts.fontPixelDialogText
+        visible: true // TODO: set visible if in service mode
+    }
+
     /*
     Diagnostics {
         id: _diagnostics
@@ -100,36 +115,54 @@
 
     SettingsBluetooth {
         id: _bluetooth
-        onClickedBack: pop()
+        onClickedBack: _settingsStack.pop()
 
     }
 
     SettingsWifi {
         id: _wifi
-        onClickedBack: pop()
+        onClickedBack: _settingsStack.pop()
+
     }
 
+    SettingsDeviceInformation {
+        id: _deviceInformation
+        onClickedBack: _settingsStack.pop()
+    }
+
     SettingsDateTimeSet {
         id: _dateTimeSet
-        onClickedBack: pop()
+        onClickedBack: _settingsStack.pop()
     }
 
     Column {
-        anchors.centerIn: parent;
+        anchors.centerIn: parent
+        SettingsItem { id: _item_
+            title   : qsTr("Device Information")
+            onClicked: _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: {
-                push(_wifi);
+                _settingsStack.push(_wifi);
                 vNetworkModel.doScan()
             }
         }
+        SettingsItem { id: _item_serviceMode
+            title   : qsTr("Service Mode")
+            onClicked: {
+                // TODO: Ask for service password before setting service mode to true
+                // TODO: Hide main menu and enable shutdown button
+                console.debug("Clicked login to service mode");
+            }
+            visible: true // TODO: set to false if already in service mode
+        }
         SettingsItem { id: _itemDateTimeSet
             title   : qsTr("Set Date and Time")
             onClicked: {