Index: sources/gui/qml/main.qml
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r0a4abcc41defc031ae20dd79f9550619bc6c9806
--- sources/gui/qml/main.qml	(.../main.qml)	(revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
@@ -21,19 +21,20 @@
 import Gui.View     0.1
 import Gui.Actions  0.1
 
-// TODO : When Testing data on Setting screen is removed
-//        This needs to be moved into the TreatmentFlows.qml
+// View classes
+import VHDOperationMode                             0.1
+import VPreTreatmentStates                          0.1
 import VHDTreatmentStates                           0.1
-import VTreatmentRanges                             0.1
+
 import VTreatmentBloodFlow                          0.1
 import VTreatmentDialysateFlow                      0.1
 import VTreatmentPressureOcclusion                  0.1
 import VTreatmentUltrafiltration                    0.1
 import VTreatmentTime                               0.1
-import VHDOperationMode                             0.1
 import VTreatmentRinseback                          0.1
 import VTreatmentRecirculate                        0.1
 import VTreatmentBloodPrime                         0.1
+import VTreatmentRanges                             0.1
 import VHDAccelerometer                             0.1
 
 import VDGDrainPump                                 0.1
@@ -79,6 +80,9 @@
     height: Variables.applicationHeight
 
     VHDOperationMode                            { id: vHDOperationMode                              }
+    VPreTreatmentStates                         { id: vPreTreatmentStates                           }
+    VHDTreatmentStates                          { id: vHDTreatmentStates                            }
+
     VTreatmentBloodFlow                         { id: vTreatmentBloodFlow                           }
     VTreatmentDialysateFlow                     { id: vTreatmentDialysateFlow                       }
     VTreatmentPressureOcclusion                 { id: vTreatmentPressureOcclusion                   }
@@ -107,7 +111,6 @@
     VTreatmentBegin                             { id: vTreatmentBegin                               }
     VTreatmentAdjustmentUltrafiltrationInit     { id: vTreatmentAdjustmentUltrafiltrationInit       }
 
-    VHDTreatmentStates                          { id: vHDTreatmentStates                            }
 
     VTreatmentRanges                            { id: vTreatmentRanges                              }
     VTreatmentAdjustmentSaline                  { id: vTreatmentAdjustmentSaline                    }