Index: sources/gui/qml/main.qml
===================================================================
diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed
--- sources/gui/qml/main.qml	(.../main.qml)	(revision e0412efcf85964a18ec52ad80f233c45998eb45a)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed)
@@ -22,10 +22,14 @@
 import Gui.Actions  0.1
 
 // View classes
+import VHDAccelerometer                             0.1
+import VTreatmentAdjustmentVersions                 0.1
+
+// States views
 import VHDOperationMode                             0.1
 import VPreTreatmentStates                          0.1
 import VHDTreatmentStates                           0.1
-
+// In-Treatment - Data
 import VTreatmentBloodFlow                          0.1
 import VTreatmentDialysateFlow                      0.1
 import VTreatmentPressureOcclusion                  0.1
@@ -35,12 +39,20 @@
 import VTreatmentRecirculate                        0.1
 import VTreatmentBloodPrime                         0.1
 import VTreatmentRanges                             0.1
-import VHDAccelerometer                             0.1
-// Pre-Treatment Progress Data
+// Pre-Treatment
+import VPreTreatmentAdjustmentInitTreatment         0.1
 import VDGFilterFlush                               0.1
+import VPreTreatmentAdjustmentWaterSample           0.1
+import VPreTreatmentAdjustmentConsumablesConfirm    0.1
 import VPreTreatmentSelfTestNoCartridge             0.1
+import VPreTreatmentAdjustmentDisposablesConfirm    0.1
 import VPreTreatmentSelfTestDry                     0.1
-import VPreTreatmentDisposablePrime                 0.1
+import VPreTreatmentAdjustmentDisposablesPrime      0.1
+import VPreTreatmentDisposablesPrime                0.1
+import VPreTreatmentAdjustmentPatientConnectionBegin    0.1
+import VPreTreatmentAdjustmentUltrafiltrationInit   0.1
+import VPreTreatmentAdjustmentPatientConnectionConfirm  0.1
+import VPreTreatmentAdjustmentStartTreatment        0.1
 // ---
 import VDGDrainPump                                 0.1
 import VDGHeaters                                   0.1
@@ -54,11 +66,10 @@
 import VTreatmentBegin                              0.1
 import VTreatmentCreate                             0.1
 import VDGAccelerometer                             0.1
-
+// In-Treatment - Adjustemnt
 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
@@ -67,8 +78,8 @@
 import VTreatmentAdjustmentRinseback                0.1
 import VTreatmentAdjustmentRecirculate              0.1
 import VTreatmentAdjustmentEnd                      0.1
-import VTreatmentAdjustmentVersions                 0.1
 
+
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/pages"
@@ -107,17 +118,27 @@
     VDGTemperatures                             { id: vDGTemperatures                               }
     VDGValvesStates                             { id: vDGValvesStates                               }
     VDGAccelerometer                            { id: vDGAccelerometer                              }
+
     // --- Pre-Treatment Progress Data
-    VDGFilterFlush                              { id: vDGFilterFlush                                }
-    VPreTreatmentSelfTestNoCartridge            { id: vPreTreatmentSelfTestNoCartridge              }
-    VPreTreatmentSelfTestDry                    { id: vPreTreatmentSelfTestDry                      }
-    VPreTreatmentDisposablePrime                { id: vPreTreatmentDisposablePrime                  }
+    VPreTreatmentAdjustmentInitTreatment            { id: vPreTreatmentAdjustmentInitTreatment              }
+    VDGFilterFlush                                  { id: vDGFilterFlush                                    }
+    VPreTreatmentAdjustmentWaterSample              { id: vPreTreatmentAdjustmentWaterSample                }
+    VPreTreatmentAdjustmentConsumablesConfirm       { id: vPreTreatmentAdjustmentConsumablesConfirm         }
+    VPreTreatmentSelfTestNoCartridge                { id: vPreTreatmentSelfTestNoCartridge                  }
+    VPreTreatmentAdjustmentDisposablesConfirm       { id: vPreTreatmentAdjustmentDisposablesConfirm         }
+    VPreTreatmentSelfTestDry                        { id: vPreTreatmentSelfTestDry                          }
+    VPreTreatmentAdjustmentDisposablesPrime         { id: vPreTreatmentAdjustmentDisposablesPrime           }
+    VPreTreatmentDisposablesPrime                   { id: vPreTreatmentDisposablesPrime                     }
+    VPreTreatmentAdjustmentPatientConnectionBegin   { id: vPreTreatmentAdjustmentPatientConnectionBegin     }
+    VPreTreatmentAdjustmentUltrafiltrationInit      { id: vPreTreatmentAdjustmentUltrafiltrationInit        }
+    VPreTreatmentAdjustmentPatientConnectionConfirm { id: vPreTreatmentAdjustmentPatientConnectionConfirm   }
+    VPreTreatmentAdjustmentStartTreatment           { id: vPreTreatmentAdjustmentStartTreatment             }
+
     // ---
     VTreatmentAdjustmentDuration                { id: vTreatmentAdjustmentDuration                  }
     VTreatmentAdjustmentFlows                   { id: vTreatmentAdjustmentFlows                     }
     VTreatmentCreate                            { id: vTreatmentCreate                              }
     VTreatmentBegin                             { id: vTreatmentBegin                               }
-    VTreatmentAdjustmentUltrafiltrationInit     { id: vTreatmentAdjustmentUltrafiltrationInit       }
 
 
     VTreatmentRanges                            { id: vTreatmentRanges                              }