Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r45ce5cd058a8d0239d486e0ab4b057731f7dba76 -r1286d74bd015276aab604808be2766136091c125
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 1286d74bd015276aab604808be2766136091c125)
@@ -24,7 +24,6 @@
 import "qrc:/pages/pretreatment"
 import "qrc:/pages/pretreatment/create"
 import "qrc:/pages/treatment"
-import "qrc:/pages/endtreatment"
 import "qrc:/pages/posttreatment"
 
 /*!
@@ -54,12 +53,6 @@
     // In TreatmentStack
     TreatmentStack                  { id: _treatmentStack                   }
 
-    // End Treatment
-    EndTreatmentRinsebackStack      { id: _endTreatmentRinsebackStack       }
-    EndTreatmentRecirculateStack    { id: _endTreatmentRecirculateStack     }
-    EndTreatmentEndStack            { id: _endTreatmentEndStack             }
-
-
     // Post Treatment
     PostTreatmentStack              { id: _postTreatmentStack               }
 
@@ -69,7 +62,10 @@
     }
 
     ScreenItem { id: _postModeScreen
-        onVisibleChanged: if (visible) _mainMenu.hidden = true
+        onVisibleChanged: if (visible) {
+                            _headerBar.activeStack = null
+                            _mainMenu.hidden = true
+                        }
         Image { id: _dialityLogo
             Behavior on opacity { OpacityAnimator { duration: 1000 } }
             opacity         : _postModeScreen.visible ? 1 : 0
@@ -117,6 +113,7 @@
         onCreateTreatment               : { vPreTreatmentAdjustmentInitTreatment.doInitiate(                    )}
         onVisibleChanged: {
             if (visible) {
+                _headerBar.activeStack = null
                 _mainMenu.hidden = false // initially our landing screen is _initialModeScreen which should not have the Main menu.
             }
             else {
@@ -133,7 +130,7 @@
         function onFaultChanged                 ( vValue ) { page( _startupScreen                   , vValue    )}
         function onServiceChanged               ( vValue ) { page( _startupScreen                   , vValue    )}
         function onInitChanged                  ( vValue ) { page( _postModeScreen                  , vValue    )
-                                                             if( vValue ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run
+                                                             if( vValue ) { vHDPOSTData.reset()                 } // better to reset on vinit = true because the rest makes the screen animation to run
         }
 
         function onHomeChanged                  ( vValue ) { page( _startupScreen                   , vValue    )}
@@ -159,9 +156,6 @@
         // in-Treatmet
         function onTxDialysisChanged            ( vValue ) { page( _treatmentStack                  , vValue    )}
 
-        function onTxRinsebackChanged           ( vValue ) { page( _endTreatmentRinsebackStack      , vValue    )}
-        function onTxRecirculateChanged         ( vValue ) { page( _endTreatmentRecirculateStack    , vValue    )}
-
         // Treatment Stop
         function onTxStopChanged                ( vValue ) { page( _treatmentStack                  , vValue    )}
         function onTsRecirculateChanged         ( vValue ) { page( null                             , vValue    )}