Index: sources/gui/qml/main.qml
===================================================================
diff -u -ree983e9c2e75a22b5770d67dce553d3df088db64 -rcbea4224ad67eecc2e7c4c66df9a7db711c72832
--- sources/gui/qml/main.qml	(.../main.qml)	(revision ee983e9c2e75a22b5770d67dce553d3df088db64)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision cbea4224ad67eecc2e7c4c66df9a7db711c72832)
@@ -12,45 +12,6 @@
  *
  */
 
-/*
--Item
-    Circle
-    LogoD
-    MainMenu
-    PlaceHolderText
-    ProgressCircle
-    ScreenItem
-        StackItem
-    TextRect
-    TimeText
-    TouchArea
-    RangeMarker
-
--Text
-    TitleText
-
--Rectangle
-    Line
-    Background
-    CloseButton
-    TouchRect
-        BackButton
-        ConfirmButton
-        ExportButton
-        USBButton
-    RangeRect
-        ProgressBar
-            ProgressBarEx
-        ProgressRect
-        Slider
-        RangeBar
-
--Dialog
-    ModalDialog
-        AutoHideInfo
-        PowwerOff
-*/
-
 // Qt
 import QtQuick 2.12
 
@@ -61,14 +22,23 @@
 
 // TODO : When Testing data on Setting screen is removed
 //        This needs to be moved into the TreatmentFlows.qml
-import VTreatmentAdjustmentsResponse    0.1;
-import VTreatmentBloodFlow              0.1;
-import VTreatmentDialysateFlow          0.1;
-import VTreatmentUltrafiltration        0.1;
-import VTreatmentTime                   0.1;
-import VAlarmStatus                     0.1;
-import VPowerOff                        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 VTreatmentAdjustmentDuration                 0.1;
+import VTreatmentAdjustmentFlows                    0.1;
+import VTreatmentAdjustmentUltrafiltrationState     0.1;
+import VTreatmentAdjustmentUltrafiltrationEdit      0.1;
+import VTreatmentAdjustmentUltrafiltrationConfirm   0.1;
+
+import VLoadCellReadings                            0.1;
+import VTemperatureSensors                          0.1;
+
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/pages"
@@ -87,7 +57,7 @@
 
     GuiView { id: _GuiView
         onDidActionReceive: {
-            //console.debug(vData)
+            //console.debug(vAction, vData)
             switch(vAction) {
             case GuiActions.PowerOffBroadcast:
                 _autoHideInfo.showDialog(
@@ -101,11 +71,6 @@
 
     // TODO : When Testing data on Setting screen is removed
     //        This needs to be moved into the Treatment______.qml
-    VTreatmentAdjustmentsResponse   { id: vTreatmentAdjustmentsResponse }
-    VTreatmentBloodFlow             { id: vTreatmentBloodFlow       }
-    VTreatmentDialysateFlow         { id: vTreatmentDialysateFlow   }
-    VTreatmentUltrafiltration       { id: vTreatmentUltrafiltration }
-    VTreatmentTime                  { id: vTreatmentTime            }
     VAlarmStatus                    { id: vAlarmStatus
         onRaiseAlarm: {
             updateAlarm();
@@ -128,34 +93,28 @@
             _alarm_dialog.visible = false;
         }
     }
-    VPowerOff                       { id: vPowerOff
-        onPoweroffTriggered: {
-            switch (vpoweroff) {
-            case GuiActions.Command:
-                _powerOffDialog.open()
-                break;
+    VPowerOff                                   { id: vPowerOff }
+    VTreatmentBloodFlow                         { id: vTreatmentBloodFlow                           }
+    VTreatmentDialysateFlow                     { id: vTreatmentDialysateFlow                       }
+    VTreatmentPressureOcclusion                 { id: vTreatmentPressureOcclusion                   }
+    VTreatmentUltrafiltration                   { id: vTreatmentUltrafiltration                     }
+    VTreatmentTime                              { id: vTreatmentTime                                }
 
-            case GuiActions.Timeout:
-                _powerOffDialog.close()
-                break;
+    VLoadCellReadings                           { id: vLoadCellReadings                             }
+    VTemperatureSensors                         { id: vTemperatureSensors                           }
 
-            case GuiActions.Rejected:
-                _autoHideInfo.showDialog(
-                            qsTr("Cannot shutdown during 'Treatment'"), // '%1').arg()
-                            2000 // notifies user and hides the dialog
-                            )
-                break;
+    VTreatmentAdjustmentDuration                { id: vTreatmentAdjustmentDuration                  }
+    VTreatmentAdjustmentFlows                   { id: vTreatmentAdjustmentFlows                     }
+    VTreatmentAdjustmentUltrafiltrationState    { id: vTreatmentAdjustmentUltrafiltrationState      }
+    VTreatmentAdjustmentUltrafiltrationEdit     { id: vTreatmentAdjustmentUltrafiltrationEdit       }
+    VTreatmentAdjustmentUltrafiltrationConfirm  { id: vTreatmentAdjustmentUltrafiltrationConfirm    }
 
-            }
-        }
-    }
-
     // ----- Follow the below Z order -----
     // 1 - Screens
     // 1 - 1
     SettingsStack  { id: _settingsStack  }
     // 1 - 2
-    ManagerStack   { id: _mansagerStack  }
+    ManagerStack   { id: _managerStack   }
     // 1 - 3
     TreatmentStack { id: _treatmentStack }
 
@@ -166,9 +125,9 @@
             _treatmentStack.visible = true
         }
         onItemPressed: {
-            _treatmentStack .visible = vIndex == 0;
-            _mansagerStack  .visible = vIndex == 1;
-            _settingsStack  .visible = vIndex == 2;
+            _treatmentStack.visible = vIndex == 0;
+            _managerStack  .visible = vIndex == 1;
+            _settingsStack .visible = vIndex == 2;
         }
     }
 
@@ -184,8 +143,8 @@
         }
     }
 
-
     NotificationBar { id: _alarm_bar
+
         anchors.bottom: _mainMenu.top
         level   : vAlarmStatus.alarm_Priority
         text    : vAlarmStatus.text;
@@ -297,6 +256,27 @@
 
         }
         return [background, foreground];
+    }
 
+    Connections { target: vPowerOff
+        onPoweroffTriggered: {
+            switch (vpoweroff) {
+            case GuiActions.Command:
+                _powerOffDialog.open()
+                break;
+
+            case GuiActions.Timeout:
+                _powerOffDialog.close()
+                break;
+
+            case GuiActions.Rejected:
+                _autoHideInfo.showDialog(
+                            qsTr("Cannot shutdown during 'Treatment'"), // '%1').arg()
+                            2000 // notifies user and hides the dialog
+                            )
+                break;
+
+            }
+        }
     }
 }