Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -r08ab5b3dbe26b4c7b7bb2ac539b1cfd62a4676c7 -r0f0a1ba80bba810155cfde30c054d94e7ac3fe0e
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 08ab5b3dbe26b4c7b7bb2ac539b1cfd62a4676c7)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 0f0a1ba80bba810155cfde30c054d94e7ac3fe0e)
@@ -84,14 +84,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
@@ -111,10 +126,19 @@
 
     }
 
+    SettingsDeviceInformation {
+        id: _deviceInformation
+        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: _settingsStack.push(_bluetooth);
@@ -127,6 +151,15 @@
                 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
+        }
     }
 }