Index: sources/gui/qml/main.qml
===================================================================
diff -u -rd34453298b70e10eb16414cbf16d8b168618ca5b -rbd560752aaa76183f168f0af6ad97b75b6b57c79
--- sources/gui/qml/main.qml	(.../main.qml)	(revision d34453298b70e10eb16414cbf16d8b168618ca5b)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision bd560752aaa76183f168f0af6ad97b75b6b57c79)
@@ -23,6 +23,22 @@
 
 // TODO : When Testing data on Setting screen is removed
 //        This needs to be moved into the TreatmentFlows.qml
+import VHDTreatmentStates                           0.1
+import VTreatmentRanges                             0.1
+import VDGAccelerometer                             0.1
+
+import VTreatmentAdjustmentUltrafiltrationState     0.1
+import VTreatmentAdjustmentUltrafiltrationInit      0.1
+import VTreatmentAdjustmentUltrafiltrationEdit      0.1
+import VTreatmentAdjustmentUltrafiltrationConfirm   0.1
+import VTreatmentAdjustmentPressuresLimits          0.1
+import VTreatmentAdjustmentSaline                   0.1
+import VTreatmentAdjustmentHeparin                  0.1
+import VTreatmentAdjustmentRinseback                0.1
+import VTreatmentAdjustmentRecirculate              0.1
+import VTreatmentAdjustmentEnd                      0.1
+import VTreatmentAdjustmentVersions                 0.1
+
 import VTreatmentBloodFlow                          0.1;
 import VTreatmentDialysateFlow                      0.1;
 import VTreatmentPressureOcclusion                  0.1;
@@ -31,6 +47,10 @@
 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;
@@ -48,10 +68,14 @@
 import VDGValvesStates                              0.1;
 import VPriming                                     0.1;
 import VTreatmentBegin                              0.1;
-import VTreatmentEnd                                0.1;
-import VTreatmentAdjustmentUltrafiltrationInit      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"
@@ -93,7 +117,11 @@
     VTreatmentPressureOcclusion                 { id: vTreatmentPressureOcclusion                   }
     VTreatmentUltrafiltration                   { id: vTreatmentUltrafiltration                     }
     VTreatmentTime                              { id: vTreatmentTime                                }
-
+    VTreatmentBloodPrime                        { id: vTreatmentBloodPrime                          }
+    VTreatmentRinseback                         { id: vTreatmentRinseback                           }
+    VTreatmentRecirculate                       { id: vTreatmentRecirculate                         }
+    VHDAccelerometer                            { id: vHDAccelerometer                              }
+    // ---- DG
     VDGDrainPump                                { id: vDGDrainPump                                  }
     VDGHeaters                                  { id: vDGHeaters                                    }
     VDGLoadCellReadings                         { id: vDGLoadCellReadings                           }
@@ -103,18 +131,37 @@
     VDGReservoir                                { id: vDGReservoir                                  }
     VDGTemperatures                             { id: vDGTemperatures                               }
     VDGValvesStates                             { id: vDGValvesStates                               }
-
+    VDGAccelerometer                            { id: vDGAccelerometer                              }
+    // ---
     VTreatmentAdjustmentDuration                { id: vTreatmentAdjustmentDuration                  }
     VTreatmentAdjustmentFlows                   { id: vTreatmentAdjustmentFlows                     }
     VTreatmentCreate                            { id: vTreatmentCreate                              }
     VBluetooth                                  { id: vBluetooth                                    }
     VPriming                                    { id: vPriming                                      }
     VTreatmentBegin                             { id: vTreatmentBegin                               }
-    VTreatmentEnd                               { id: vTreatmentEnd                                 }
     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                            }
+
+    VTreatmentRanges                            { id: vTreatmentRanges                              }
+    VTreatmentAdjustmentSaline                  { id: vTreatmentAdjustmentSaline                    }
+    VTreatmentAdjustmentUltrafiltrationState    { id: vTreatmentAdjustmentUltrafiltrationState      }
+    VTreatmentAdjustmentUltrafiltrationEdit     { id: vTreatmentAdjustmentUltrafiltrationEdit       }
+    VTreatmentAdjustmentUltrafiltrationConfirm  { id: vTreatmentAdjustmentUltrafiltrationConfirm    }
+    VTreatmentAdjustmentPressuresLimits         { id: vTreatmentAdjustmentPressuresLimits           }
+    VTreatmentAdjustmentHeparin                 { id: vTreatmentAdjustmentHeparin                   }
+    VTreatmentAdjustmentRinseback               { id: vTreatmentAdjustmentRinseback                 }
+    VTreatmentAdjustmentRecirculate             { id: vTreatmentAdjustmentRecirculate               }
+    VTreatmentAdjustmentEnd                     { id: vTreatmentAdjustmentEnd                       }
+    VTreatmentAdjustmentVersions                { id: vTreatmentAdjustmentVersions                  }
     // ----- Follow the below Z order -----
     // 1 - Screens
     // 1 - 1
@@ -135,6 +182,7 @@
             _managerStack  .visible = vIndex == 1;
             _settingsStack .visible = vIndex == 2;
         }
+        visible: !vServiceMode.isServiceMode
     }
 
     // 4 - Modals
@@ -213,7 +261,7 @@
         onOkClicked         : vAlarmStatus.doUserActionOk       ()
         onMinimizeClicked   : {
             alarmMinimize()
-            // when used minimizes the alarm it can stay minimized until otherwize is set
+            // when user minimizes the alarm it can stay minimized until otherwize is set
             // by the next alarm status received.
             // see also the "Connections { target: vAlarmStatus" implementation
             vAlarmStatus.alarm_KeepMinimized = true
@@ -262,8 +310,11 @@
         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