Index: sources/gui/qml/main.qml
===================================================================
diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -rbd560752aaa76183f168f0af6ad97b75b6b57c79
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision bd560752aaa76183f168f0af6ad97b75b6b57c79)
@@ -25,35 +25,8 @@
 //        This needs to be moved into the TreatmentFlows.qml
 import VHDTreatmentStates                           0.1
 import VTreatmentRanges                             0.1
-import VTreatmentBloodFlow                          0.1
-import VTreatmentDialysateFlow                      0.1
-import VTreatmentPressureOcclusion                  0.1
-import VTreatmentUltrafiltration                    0.1
-import VTreatmentTime                               0.1
-import VAlarmStatus                                 0.1
-import VPowerOff                                    0.1
-import VHDOperationMode                             0.1
-import VTreatmentRinseback                          0.1
-import VTreatmentRecirculate                        0.1
-import VTreatmentBloodPrime                         0.1
-import VHDAccelerometer                             0.1
-
-import VDGDrainPump                                 0.1
-import VDGHeaters                                   0.1
-import VDGLoadCellReadings                          0.1
-import VDGOperationMode                             0.1
-import VDGPressures                                 0.1
-import VDGROPump                                    0.1
-import VDGReservoir                                 0.1
-import VDGTemperatures                              0.1
-import VDGValvesStates                              0.1
-import VPriming                                     0.1
-import VTreatmentBegin                              0.1
-import VTreatmentCreate                             0.1
 import VDGAccelerometer                             0.1
 
-import VTreatmentAdjustmentDuration                 0.1
-import VTreatmentAdjustmentFlows                    0.1
 import VTreatmentAdjustmentUltrafiltrationState     0.1
 import VTreatmentAdjustmentUltrafiltrationInit      0.1
 import VTreatmentAdjustmentUltrafiltrationEdit      0.1
@@ -66,6 +39,44 @@
 import VTreatmentAdjustmentEnd                      0.1
 import VTreatmentAdjustmentVersions                 0.1
 
+import VTreatmentBloodFlow                          0.1;
+import VTreatmentDialysateFlow                      0.1;
+import VTreatmentPressureOcclusion                  0.1;
+import VTreatmentUltrafiltration                    0.1;
+import VTreatmentTime                               0.1;
+import VAlarmStatus                                 0.1;
+import VPowerOff                                    0.1;
+import VHDOperationMode                             0.1;
+import VTreatmentRinseback                          0.1
+import VTreatmentRecirculate                        0.1
+import VTreatmentBloodPrime                         0.1
+import VHDAccelerometer                             0.1
+
+import VTreatmentAdjustmentDuration                 0.1;
+import VTreatmentAdjustmentFlows                    0.1;
+
+import VTreatmentCreate                             0.1;
+import VBluetooth                                   0.1;
+import VDGDrainPump                                 0.1;
+import VDGHeaters                                   0.1;
+import VDGLoadCellReadings                          0.1;
+import VDGOperationMode                             0.1;
+import VDGPressures                                 0.1;
+import VDGROPump                                    0.1;
+import VDGReservoir                                 0.1;
+import VDGTemperatures                              0.1;
+import VDGValvesStates                              0.1;
+import VPriming                                     0.1;
+import VTreatmentBegin                              0.1;
+import VVitals                                      0.1;
+import VAlert                                       0.1;
+import VNetworkModel                                0.1;
+import VDateTime                                    0.1;
+import VServiceMode                                 0.1;
+import VDeviceInformation                           0.1;
+import VAlarmVolume                                 0.1;
+import VBrightness                                  0.1;
+
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/pages"
@@ -125,9 +136,18 @@
     VTreatmentAdjustmentDuration                { id: vTreatmentAdjustmentDuration                  }
     VTreatmentAdjustmentFlows                   { id: vTreatmentAdjustmentFlows                     }
     VTreatmentCreate                            { id: vTreatmentCreate                              }
+    VBluetooth                                  { id: vBluetooth                                    }
     VPriming                                    { id: vPriming                                      }
     VTreatmentBegin                             { id: vTreatmentBegin                               }
     VTreatmentAdjustmentUltrafiltrationInit     { id: vTreatmentAdjustmentUltrafiltrationInit       }
+    VVitals                                     { id: vVitals                                       }
+    VAlert                                      { id: vAlert                                        }
+    VNetworkModel                               { id: vNetworkModel                                 }
+    VDateTime                                   { id: vDateTime                                     }
+    VServiceMode                                { id: vServiceMode                                  }
+    VDeviceInformation                          { id: vDeviceInformation                            }
+    VAlarmVolume                                { id: vAlarmVolume                                  }
+    VBrightness                                 { id: vBrightness                                   }
 
     VHDTreatmentStates                          { id: vHDTreatmentStates                            }
 
@@ -162,6 +182,7 @@
             _managerStack  .visible = vIndex == 1;
             _settingsStack .visible = vIndex == 2;
         }
+        visible: !vServiceMode.isServiceMode
     }
 
     // 4 - Modals
@@ -182,16 +203,19 @@
         _alarmListDialog.visible = false
         _alarmBar       .visible = true
     }
+
     function alarmMaximize() {
         _alarmDialog    .visible = true
         _alarmListDialog.visible = false
         _alarmBar       .visible = false
     }
+
     function alarmList() {
         _alarmDialog    .visible = false
         _alarmListDialog.visible = true
         _alarmBar       .visible = false
     }
+
     function alarmHide() {
         _alarmDialog    .visible = false
         _alarmListDialog.visible = false
@@ -286,6 +310,13 @@
         visible: true // ! _GuiView.sdIsReady || _GuiView.sdIsReadOnly
     }
 
+    // dialogs
+    Alert { id: _alert }
+    VitalsEntry { id: _vitalsEntry }
+    WifiJoinDisconnect { id: _wifiJoinDisconnect }
+    ServiceLogin { id: _serviceLogin }
+    Keyboard { id: _keyboard }
+
     Connections { target: vPowerOff
         onPoweroffTriggered: {
             switch (vpoweroff) {
@@ -341,4 +372,11 @@
 
         onDidAlarmEmpty: alarmHide()
     }
+
+    Connections {
+        target: vVitals
+        onDidManualEntryRequest: {
+            _vitalsEntry.open()
+        }
+    }
 }