Index: sources/gui/qml/main.qml
===================================================================
diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -r016578b44e879b89bd42dda7763ed50e67d7e64c
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 016578b44e879b89bd42dda7763ed50e67d7e64c)
@@ -61,14 +61,17 @@
 
 // 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 VTreatmentAdjustmentDuration     0.1;
+import VTreatmentAdjustmentFlows        0.1;
+
+
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/pages"
@@ -102,34 +105,16 @@
 
     // 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              }
-    VPowerOff                       { id: vPowerOff
-        onPoweroffTriggered: {
-            switch (vpoweroff) {
-            case GuiActions.Command:
-                _powerOffDialog.open()
-                break;
+    VTreatmentAdjustmentDuration    { id: vTreatmentAdjustmentDuration  }
+    VTreatmentAdjustmentFlows       { id: vTreatmentAdjustmentFlows     }
 
-            case GuiActions.Timeout:
-                _powerOffDialog.close()
-                break;
+    VTreatmentBloodFlow             { id: vTreatmentBloodFlow           }
+    VTreatmentDialysateFlow         { id: vTreatmentDialysateFlow       }
+    VTreatmentUltrafiltration       { id: vTreatmentUltrafiltration     }
+    VTreatmentTime                  { id: vTreatmentTime                }
+    VAlarmStatus                    { id: vAlarmStatus                  }
+    VPowerOff                       { id: vPowerOff                     }
 
-            case GuiActions.Rejected:
-                _autoHideInfo.showDialog(
-                            qsTr("Cannot shutdown during 'Treatment'"), // '%1').arg()
-                            2000 // notifies user and hides the dialog
-                            )
-                break;
-
-            }
-        }
-    }
-
     // ----- Follow the below Z order -----
     // 1 - Screens
     // 1 - 1
@@ -186,4 +171,26 @@
         text: Qt.application.version
         font.pixelSize: 14
     }
+
+    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;
+
+            }
+        }
+    }
 }