Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -r65558208e4968de9a5470ff5fda1ee2a9d00c793
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 65558208e4968de9a5470ff5fda1ee2a9d00c793)
@@ -20,9 +20,11 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/pages/disinfect"
 import "qrc:/pages/pretreatment"
 import "qrc:/pages/pretreatment/create"
 import "qrc:/pages/treatment"
+import "qrc:/pages/endtreatment"
 import "qrc:/pages/posttreatment"
 
 /*!
@@ -35,6 +37,8 @@
     stackView.initialItem   : _mainHome
 
 
+    // Standby / Disinfection
+    DisinfectStack                  { id: _disinfectStack                   }
     // Pre Treatment
     PreTreatmentCreateStack         { id: _preTreatmentCreateStack          }
     PreTreatmentMainStack           { id: _preTreatmentMainStack            }
@@ -46,13 +50,14 @@
         onBackClicked:  _root.pop ( _mainHome )
     }
 
+    // End Treatment
+    EndTreatmentRinsebackStack      { id: _endTreatmentRinsebackStack       }
+    EndTreatmentRecirculateStack    { id: _endTreatmentRecirculateStack     }
+    EndTreatmentEndStack            { id: _endTreatmentEndStack             }
+
     // Post Treatment
-    PostTreatmentBloodPrime         { id: _postTreatmentBloodPrime          } // only one page, no stack for now.
-    PostTreatmentRinsebackStack     { id: _postTreatmentRinsebackStack      }
-    PostTreatmentRecirculateStack   { id: _postTreatmentRecirculateStack    }
-    PostTreatmentEndStack           { id: _postTreatmentEndStack            }
+    PostTreatmentStack              { id: _postTreatmentStack               }
 
-
     ScreenItem { id: _faultModeScreen
         PlaceHolderText { screenName: qsTr("FAULT  MODE") }
         onVisibleChanged: if (visible) _mainMenu.hidden = true
@@ -68,39 +73,43 @@
         onVisibleChanged: if (visible) _mainMenu.hidden = true
     }
 
-    MainHome                        { id: _mainHome
-        onStartTreatment            : { page( _treatmentStack                                               )}
-        onCreateTreatment           : { vPreTreatmentAdjustmentInitTreatment.doInitiate()                    }
+    MainHome                            { id: _mainHome
+        onStartTreatment                : { page( _treatmentStack                                               )}
+        onCreateTreatment               : { vPreTreatmentAdjustmentInitTreatment.doInitiate()                    }
     }
 
     Connections { target: vHDOperationMode
-        onFaultChanged              : { page( _faultModeScreen                  , vfault                    )}
-        onServiceChanged            : { page( _serviceModeScreen                , vservice                  )}
-        onInitChanged               : { page( _initialModeScreen                , vinit                     )}
-        onStandbyChanged            : { page( _mainHome                         , vstandby                  )}
-        onValidateParametersChanged : { page( _preTreatmentCreateStack          , vvalidateParameters       )}
-        onPreTreatmentChanged       : { page( _preTreatmentMainStack            , vpreTreatment             )}
-        onInTreatmentChanged        : { page( _treatmentStack                   , vinTreatment              )}
-        onPostTreatmentChanged      : { page( null                              , vpostTreatment            )}
-        onInvalidModeChanged        : { page( null                              , vinvalidMode              )}
-    }
+        onFaultChanged                  : { page( _faultModeScreen                  , vfault                    )}
+        onServiceChanged                : { page( _serviceModeScreen                , vservice                  )}
+        onInitChanged                   : { page( _initialModeScreen                , vinit                     )}
 
+        onHomeChanged                   : { page( _mainHome                         , vhome                     )}
+        onStandbyChanged                : { /* It depends on the subModes of the standBy. Handled by onHome.  */ }
+        onStandbyStartChanged           : { /* It depends on the subModes of the standBy. Handled by onHome.  */ }
+        onStandbyWaitTreatmentChanged   : { /* It depends on the subModes of the standBy. Handled by onHome.  */ }
+        onStandbyWaitDisinfectChanged   : { page( _disinfectStack                   , vstandbyWaitDisinfect     )}
 
+        onValidateParametersChanged     : { page( _preTreatmentCreateStack          , vvalidateParameters       )}
+        onPreTreatmentChanged           : { page( _preTreatmentMainStack            , vpreTreatment             )}
+        onInTreatmentChanged            : { page( _treatmentStack                   , vinTreatment              )}
+        onPostTreatmentChanged          : { page( _postTreatmentStack               , vpostTreatment            )}
+        onInvalidModeChanged            : { page( null                              , vinvalidMode              )}
+    }
+
     // the page function is more flixible regarding our current design
     // and it's easier(or may not need) to modify later if required.
     // and is more optimized and will never leave screen empty
     // also with what ever order they have been push with the reverse/correct animation will be poped or pushed.
     Connections { target: vHDTreatmentStates
         // Blood Prime
-        onTxBloodPrimeChanged       : { page( _postTreatmentBloodPrime          ,  vtxBloodPrime            )}
         onBpRampChanged             : { page( null                              ,  vbpRamp                  )}
 
         // in-Treatmet
         onTxDialysisChanged         : { page( _treatmentStack                   ,  vtxDialysis              )}
 
-        onTxRinsebackChanged        : { page( _postTreatmentRinsebackStack      ,  vtxRinseback             )}
-        onTxRecirculateChanged      : { page( _postTreatmentRecirculateStack    ,  vtxRecirculate           )}
-        onTxEndChanged              : { page( _postTreatmentEndStack            ,  vtxEnd                   )}
+        onTxRinsebackChanged        : { page( _endTreatmentRinsebackStack       ,  vtxRinseback             )}
+        onTxRecirculateChanged      : { page( _endTreatmentRecirculateStack     ,  vtxRecirculate           )}
+        onTxEndChanged              : { page( _endTreatmentEndStack             ,  vtxEnd                   )}
 
         // Treatment Stop
         onTxStopChanged             : { page( _treatmentStack                   ,  vtxStop                  )}