Index: denali.pro.user
===================================================================
diff -u -rfdda01b86e25893f54de3d25e83ad0e8f5484a57 -r0f0a1ba80bba810155cfde30c054d94e7ac3fe0e
--- denali.pro.user	(.../denali.pro.user)	(revision fdda01b86e25893f54de3d25e83ad0e8f5484a57)
+++ denali.pro.user	(.../denali.pro.user)	(revision 0f0a1ba80bba810155cfde30c054d94e7ac3fe0e)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2021-04-01T10:14:27. -->
+<!-- Written by QtCreator 4.10.0, 2021-04-16T10:38:11. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
Index: denali.qrc
===================================================================
diff -u -r091bc0425b84f094cbd863865a5edac2477208eb -r0f0a1ba80bba810155cfde30c054d94e7ac3fe0e
--- denali.qrc	(.../denali.qrc)	(revision 091bc0425b84f094cbd863865a5edac2477208eb)
+++ denali.qrc	(.../denali.qrc)	(revision 0f0a1ba80bba810155cfde30c054d94e7ac3fe0e)
@@ -4,6 +4,7 @@
         <file alias="SettingsStack.qml">sources/gui/qml/pages/SettingsStack.qml</file>
         <file alias="SettingsHome.qml">sources/gui/qml/pages/SettingsHome.qml</file>
         <file alias="ManagerHome.qml">sources/gui/qml/pages/ManagerHome.qml</file>
+        <file alias="SettingsDeviceInformation.qml">sources/gui/qml/pages/SettingsDeviceInformation.qml</file>
         <file alias="SettingsBluetooth.qml">sources/gui/qml/pages/SettingsBluetooth.qml</file>
         <file alias="SettingsWifi.qml">sources/gui/qml/pages/SettingsWifi.qml</file>
     </qresource>
Index: sources/gui/qml/pages/SettingsDeviceInformation.qml
===================================================================
diff -u
--- sources/gui/qml/pages/SettingsDeviceInformation.qml	(revision 0)
+++ sources/gui/qml/pages/SettingsDeviceInformation.qml	(revision 0f0a1ba80bba810155cfde30c054d94e7ac3fe0e)
@@ -0,0 +1,51 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file SettingsDeviceInformation.qml
+ * \author (last) Peter Lucia
+ * \date (last) 16-Apr-2021
+ * \author (original) Peter Lucia
+ * \date (original) 16-Apr-2021
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+import QtQuick.Controls 2.12 // for scrollbar
+
+// Project
+import Gui.Actions 0.1;
+
+//  Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+
+/*!
+ * \brief   SettingsDeviceInformation contains version
+ * and system usage information
+ */
+ScreenItem { id: _root
+
+    signal clickedBack()
+
+    BackButton { id : _backButton
+        onClicked: {
+            _root.clickedBack()
+        }
+    }
+
+    TitleText { id: _title
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors {
+            top: parent.top
+            left: parent.left
+            topMargin: Variables.settingsWIFIMargin
+        }
+        text: qsTr("Device Information")
+    }
+
+}
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
+        }
     }
 }