Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -rd129507ca6ee06e76bd3500a77996687e09d3144
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision f148379112a69d1c52027f2667e95f3f96d948ad)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision d129507ca6ee06e76bd3500a77996687e09d3144)
@@ -28,141 +28,30 @@
  */
 ScreenItem { id: _root
 
-    USBButton { id: _usbButton
-        anchors {
-            top         : parent.top
-            right       : _exportButton.left
-            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
-            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
-        }
-    }
+    TitleText { id: _titleText
+        anchors.horizontalCenter: parent.horizontalCenter;
+        anchors.top: parent.top
+        anchors.topMargin: 150
 
-    ExportButton { id: _exportButton
-        width: 150
-        height: 50
-        anchors {
-            top         : parent.top
-            right       : _poweroffButton.left
-            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
-            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
-        }
-    }
+        width: parent.width
+        text: qsTr("Device Settings")
 
-    TouchRect { id : _poweroffButton
-        width: 150
-        height: Variables.logoHeight
-        animated: true
-        anchors {
-            top         : parent.top
-            right       : parent.right
-            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
-            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
-        }
-        text.text: qsTr("Shutdown")
-        button.onPressed: {
-            _GuiView.doActionTransmit(GuiActions.PowerOff, GuiActions.NoData)
-        }
     }
 
-    Column { id: _BloodFlowColumn
-        width: 150
-        spacing: 20
-        topPadding: 100
-        leftPadding: 10
-        Text {
-            id: _BloodFlow_Title
-            text: qsTr("  Blood  ")
-            width: _BloodFlowColumn.width
-            horizontalAlignment: Text.AlignHCenter
-            color: Colors.textMain
-            font.pixelSize: Fonts.fontPixelTitle
-            font.underline: true
-        }
-        Repeater {
-            model: [
-                      vTreatmentBloodFlow.bloodFlow_FlowSetPoint                 ,
-                      vTreatmentBloodFlow.bloodFlow_MeasuredFlow     .toFixed(2) ,
-                      vTreatmentBloodFlow.bloodFlow_RotorSpeed       .toFixed(2) ,
-                      vTreatmentBloodFlow.bloodFlow_MotorSpeed       .toFixed(2) ,
-                      vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed    .toFixed(2) ,
-                      vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent  .toFixed(2) ,
-                "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle     .toFixed(2)
-            ]
-            Text {
-                text: modelData
-                width: _BloodFlowColumn.width
-                horizontalAlignment: Text.AlignRight
-                color: Colors.textMain
-                font.pixelSize: Fonts.fontPixelTitle
-            }
-        }
+    Diagnostics {
+        id: _diagnostics
+        onBackClicked: pop()
     }
 
-    Column { id: _DialysateInletFlowColumn
-        width: 150
-        spacing: 20
-        topPadding: 100
-        leftPadding: 180
-        Text {
-            id: _DialysateInletFlow_Title
-            text: qsTr("  Dialysate I ")
-            width: _DialysateInletFlowColumn.width
-            horizontalAlignment: Text.AlignLeft
-            color: Colors.textMain
-            font.pixelSize: Fonts.fontPixelTitle
-            font.underline: true
-        }
-        Repeater {
-            model: [
-                      vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint   .toFixed(2) ,
-                      vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow   .toFixed(2) ,
-                      vTreatmentDialysateFlow.dialysateFlow_RotorSpeed     .toFixed(2) ,
-                      vTreatmentDialysateFlow.dialysateFlow_MotorSpeed     .toFixed(2) ,
-                      vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed  .toFixed(2) ,
-                      vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent.toFixed(2) ,
-                "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle   .toFixed(2)
-            ]
-            Text {
-                text: modelData
-                width: _DialysateInletFlowColumn.width
-                horizontalAlignment: Text.AlignRight
-                color: Colors.textMain
-                font.pixelSize: Fonts.fontPixelTitle
-            }
-        }
-    }
+    Column {
+        anchors.centerIn: parent;
 
-    Column { id: _DialysateOutletFlowColumn
-        width: 150
-        spacing: 20
-        topPadding: 100
-        leftPadding: 400
-        Text {
-            id: _DialysateOutletFlow_Title
-            text: qsTr("  Dialysate O ")
-            width: _DialysateOutletFlowColumn.width
-            horizontalAlignment: Text.AlignLeft
-            color: Colors.textMain
-            font.pixelSize: Fonts.fontPixelTitle
-            font.underline: true
+        // add each settings page here.
+        SettingsItem { id: _item_diagnostics
+            title   : qsTr("Diagnostics")
+            onClicked: push(_diagnostics);
         }
-        Repeater {
-            model: [
-                      vTreatmentUltrafiltration.ultrafiltration_RefUFVol       .toFixed(2) ,
-                      vTreatmentUltrafiltration.ultrafiltration_MeasUFVol      .toFixed(2) ,
-                      vTreatmentUltrafiltration.ultrafiltration_RotorSpeed     .toFixed(2) ,
-                      vTreatmentUltrafiltration.ultrafiltration_MotorSpeed     .toFixed(2) ,
-                      vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed  .toFixed(2) ,
-                      vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) ,
-                "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle     .toFixed(2)
-            ]
-            Text {
-                text: modelData
-                width: _DialysateOutletFlowColumn.width
-                horizontalAlignment: Text.AlignRight
-                color: Colors.textMain
-                font.pixelSize: Fonts.fontPixelTitle
-            }
-        }
     }
+
+
 }