Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision bd01334f257c35b96b7b232beacbcd7fae60c852)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 8d6f0d14c717e6f3eecb32b6acb4c4306d8eb608)
@@ -52,21 +52,34 @@
     PostTreatmentRecirculateStack   { id: _postTreatmentRecirculateStack    }
     PostTreatmentEndStack           { id: _postTreatmentEndStack            }
 
+
+    ScreenItem { id: _faultModeScreen
+        PlaceHolderText { screenName: qsTr("FAULT  MODE") }
+    }
+
+    ScreenItem { id: _serviceModeScreen
+        PlaceHolderText { screenName: qsTr("SERVICE  MODE") }
+    }
+
+    ScreenItem { id: _InitialModeScreen
+        PlaceHolderText { screenName: qsTr("INITIAL  MODE") }
+    }
+
     MainHome                        { id: _mainHome
-        onTreatmentStarted          : _root.page ( _treatmentStack )
-        onTreatmentCreated          : vPreTreatmentAdjustmentInitTreatment.doInitiate()
+        onTreatmentStarted          : { page( _treatmentStack                                               )}
+        onTreatmentCreated          : { vPreTreatmentAdjustmentInitTreatment.doInitiate()                    }
     }
 
     Connections { target: vHDOperationMode
-        onFaultChanged              : { if ( vfault             ) { /* this is one way navigation, no getting back or out */ }}
-        onServiceChanged            : { if ( vservice           ) { /* this is one way navigation, no getting back or out */ }}
-        onInitChanged               : { if ( vinit              ) { /* this is one way navigation, no getting back or out */ }}
-        onStandbyChanged            : { if ( vstandby           ) { page( _mainHome                         )}}
-        onValidateParametersChanged : { if ( vvalidateParameters) { page( _preTreatmentCreateStack          )}}
-        onPreTreatmentChanged       : { if ( vpreTreatment      ) { page( _preTreatmentMainStack            )}}
-        onInTreatmentChanged        : { if ( vinTreatment       ) { page( _treatmentStack                   )}}
-        onPostTreatmentChanged      : { if ( vpostTreatment     ) {                                          }}
-        onInvalidModeChanged        : { if ( vinvalidMode       ) {                                          }}
+        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              )}
     }
 
 
@@ -76,20 +89,20 @@
     // 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   : { if ( vtxBloodPrime      ) { page( _postTreatmentBloodPrime          )}}
-        onBpRampChanged         : { if ( vbpRamp            ) { /* No action defined yet */              }}
+        onTxBloodPrimeChanged       : { page( _postTreatmentBloodPrime          ,  vtxBloodPrime            )}
+        onBpRampChanged             : { page( null                              ,  vbpRamp                  )}
 
         // in-Treatmet
-        onTxDialysisChanged     : { if ( vtxDialysis        ) { page( _treatmentStack                   )}}
+        onTxDialysisChanged         : { page( _treatmentStack                   ,  vtxDialysis              )}
 
-        onTxRinsebackChanged    : { if ( vtxRinseback       ) { page( _postTreatmentRinsebackStack      )}}
-        onTxRecirculateChanged  : { if ( vtxRecirculate     ) { page( _postTreatmentRecirculateStack    )}}
-        onTxEndChanged          : { if ( vtxEnd             ) { page( _postTreatmentEndStack            )}}
+        onTxRinsebackChanged        : { page( _postTreatmentRinsebackStack      ,  vtxRinseback             )}
+        onTxRecirculateChanged      : { page( _postTreatmentRecirculateStack    ,  vtxRecirculate           )}
+        onTxEndChanged              : { page( _postTreatmentEndStack            ,  vtxEnd                   )}
 
         // Treatment Stop
-        onTxStopChanged         : { if ( vtxStop            ) { page( _treatmentStack                   )}}
-        onTsRecirculateChanged  : { if ( vtsRecirculate     ) { /* No action defined yet */              }}
-        onTsRecirculateNoChanged: { if ( vtsRecirculateNo   ) { /* No action defined yet */              }}
+        onTxStopChanged             : { page( _treatmentStack                   ,  vtxStop                  )}
+        onTsRecirculateChanged      : { page( null                              ,  vtsRecirculate           )}
+        onTsRecirculateNoChanged    : { page( null                              ,  vtsRecirculateNo         )}
     }
 
     onVisibleChanged: {