Index: sources/gui/qml/main.qml
===================================================================
diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16)
@@ -23,6 +23,8 @@
 
 // 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 VTreatmentBloodFlow                          0.1
 import VTreatmentDialysateFlow                      0.1
 import VTreatmentPressureOcclusion                  0.1
@@ -31,11 +33,11 @@
 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 VDGDrainPump                                 0.1
 import VDGHeaters                                   0.1
 import VDGLoadCellReadings                          0.1
@@ -47,22 +49,22 @@
 import VDGValvesStates                              0.1
 import VPriming                                     0.1
 import VTreatmentBegin                              0.1
-import VTreatmentAdjustmentUltrafiltrationInit      0.1
+import VTreatmentCreate                             0.1
+import VDGAccelerometer                             0.1
 
-import VTreatmentRanges                             0.1
-import VTreatmentAdjustmentSaline                   0.1
-import VHDTreatmentStates                           0.1
+import VTreatmentAdjustmentDuration                 0.1
+import VTreatmentAdjustmentFlows                    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 VTreatmentRinseback                          0.1
 import VTreatmentAdjustmentRinseback                0.1
-import VTreatmentRecirculate                        0.1
 import VTreatmentAdjustmentRecirculate              0.1
 import VTreatmentAdjustmentEnd                      0.1
-import VTreatmentBloodPrime                         0.1
+import VTreatmentAdjustmentVersions                 0.1
 
 //  Qml imports
 import "qrc:/globals"
@@ -104,7 +106,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                           }
@@ -114,7 +120,8 @@
     VDGReservoir                                { id: vDGReservoir                                  }
     VDGTemperatures                             { id: vDGTemperatures                               }
     VDGValvesStates                             { id: vDGValvesStates                               }
-
+    VDGAccelerometer                            { id: vDGAccelerometer                              }
+    // ---
     VTreatmentAdjustmentDuration                { id: vTreatmentAdjustmentDuration                  }
     VTreatmentAdjustmentFlows                   { id: vTreatmentAdjustmentFlows                     }
     VTreatmentCreate                            { id: vTreatmentCreate                              }
@@ -131,12 +138,10 @@
     VTreatmentAdjustmentUltrafiltrationConfirm  { id: vTreatmentAdjustmentUltrafiltrationConfirm    }
     VTreatmentAdjustmentPressuresLimits         { id: vTreatmentAdjustmentPressuresLimits           }
     VTreatmentAdjustmentHeparin                 { id: vTreatmentAdjustmentHeparin                   }
-    VTreatmentBloodPrime                        { id: vTreatmentBloodPrime                          }
-    VTreatmentRinseback                         { id: vTreatmentRinseback                           }
-    VTreatmentRecirculate                       { id: vTreatmentRecirculate                         }
     VTreatmentAdjustmentRinseback               { id: vTreatmentAdjustmentRinseback                 }
     VTreatmentAdjustmentRecirculate             { id: vTreatmentAdjustmentRecirculate               }
     VTreatmentAdjustmentEnd                     { id: vTreatmentAdjustmentEnd                       }
+    VTreatmentAdjustmentVersions                { id: vTreatmentAdjustmentVersions                  }
     // ----- Follow the below Z order -----
     // 1 - Screens
     // 1 - 1