Index: sources/gui/qml/main.qml
===================================================================
diff -u -r016578b44e879b89bd42dda7763ed50e67d7e64c -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 016578b44e879b89bd42dda7763ed50e67d7e64c)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6)
@@ -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,15 +22,17 @@
 
 // TODO : When Testing data on Setting screen is removed
 //        This needs to be moved into the TreatmentFlows.qml
-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 VTreatmentUltrafiltration            0.1;
+import VTreatmentUltrafiltrationState       0.1;
+import VTreatmentTime                       0.1;
+import VAlarmStatus                         0.1;
+import VPowerOff                            0.1;
 
-import VTreatmentAdjustmentDuration     0.1;
-import VTreatmentAdjustmentFlows        0.1;
+import VTreatmentAdjustmentDuration         0.1;
+import VTreatmentAdjustmentFlows            0.1;
+import VTreatmentAdjustmentUltrafiltration  0.1;
 
 
 //  Qml imports
@@ -105,15 +68,17 @@
 
     // TODO : When Testing data on Setting screen is removed
     //        This needs to be moved into the Treatment______.qml
-    VTreatmentAdjustmentDuration    { id: vTreatmentAdjustmentDuration  }
-    VTreatmentAdjustmentFlows       { id: vTreatmentAdjustmentFlows     }
+    VTreatmentAdjustmentDuration        { id: vTreatmentAdjustmentDuration          }
+    VTreatmentAdjustmentFlows           { id: vTreatmentAdjustmentFlows             }
+    VTreatmentUltrafiltrationState      { id: vTreatmentUltrafiltrationState        }
+    VTreatmentAdjustmentUltrafiltration { id: vTreatmentAdjustmentUltrafiltration   }
 
-    VTreatmentBloodFlow             { id: vTreatmentBloodFlow           }
-    VTreatmentDialysateFlow         { id: vTreatmentDialysateFlow       }
-    VTreatmentUltrafiltration       { id: vTreatmentUltrafiltration     }
-    VTreatmentTime                  { id: vTreatmentTime                }
-    VAlarmStatus                    { id: vAlarmStatus                  }
-    VPowerOff                       { id: vPowerOff                     }
+    VTreatmentBloodFlow                 { id: vTreatmentBloodFlow                   }
+    VTreatmentDialysateFlow             { id: vTreatmentDialysateFlow               }
+    VTreatmentUltrafiltration           { id: vTreatmentUltrafiltration             }
+    VTreatmentTime                      { id: vTreatmentTime                        }
+    VAlarmStatus                        { id: vAlarmStatus                          }
+    VPowerOff                           { id: vPowerOff                             }
 
     // ----- Follow the below Z order -----
     // 1 - Screens