Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r600b6707b102919d981f3b1d18611834e23eae60 -r1286d74bd015276aab604808be2766136091c125
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 600b6707b102919d981f3b1d18611834e23eae60)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 1286d74bd015276aab604808be2766136091c125)
@@ -22,6 +22,7 @@
 import "qrc:/compounds"
 import "qrc:/dialogs"
 import "qrc:/globals"
+import "qrc:/pages/endtreatment"
 import "qrc:/pages/treatment/adjustments"
 
 /*!
@@ -41,7 +42,10 @@
         _treatmentAdjustmentDuration        .close()
         _treatmentAdjustmentUltrafiltration .close()
 
-        if (! visible) {
+        if (visible) {
+            _headerBar.activeStack = stackView
+        }
+        else {
             _headerBar.menuHidden = true
             stackView.initialItem = null
         }
@@ -76,13 +80,14 @@
 
     // Components
     TreatmentBloodPrime         { id: _treatmentBloodPrime
-        StackView.onActivating  : { _headerBar.titleText = qsTr("Blood Priming")  }
-        StackView.onDeactivated : { _headerBar.titleText = ""                     }
+        readonly property string headerTitle: qsTr("Blood Priming")
+
         onIncrementRate         : function(newValue) { vTreatmentAdjustmentBloodFlowRate.doAdjustment(newValue) }
         onDecrementRate         : function(newValue) { vTreatmentAdjustmentBloodFlowRate.doAdjustment(newValue) }
         onPause                 : { vTreatmentAdjustmentBloodPrime.doPause()                                    }
         onResume                : { vTreatmentAdjustmentBloodPrime.doResume()                                   }
     }
+
     Connections                 { target: vTreatmentAdjustmentBloodPrime
         function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentBloodPrime.adjustment_Accepted) {
@@ -146,21 +151,31 @@
         }
     }
 
+    // End Treatment
+    EndTreatmentRinsebackStack              { id:       _endTreatmentRinsebackStack         }
+    EndTreatmentRecirculateStack            { id:       _endTreatmentRecirculateStack       }
+
     //// Treatment Adjustment Dialogs
     TreatmentAdjustmentSetPoints            { id:       _treatmentAdjustmentSetPoints       }
     TreatmentAdjustmentPressuresLimits      { id:       _treatmentAdjustmentPressuresLimits }
     TreatmentAdjustmentBolusVolume          { id:       _treatmentAdjustmentBolusVolume     }
     TreatmentAdjustmentUltrafiltrationStack { id:       _treatmentAdjustmentUltrafiltration }
     TreatmentAdjustmentHDF                  { id:       _treatmentAdjustmentHDF             }
+    TreatmentAdjustmentDurationStack        { id:       _treatmentAdjustmentDuration        }
+    TreatmentAdjustmentVitalsInterval       { id:       _treatmentAdjustmentVitalsInterval  }
 
     Connections                 { target:   _treatmentAdjustmentSetPoints
         function onConfirmClicked                   ( vValue ) {
             vTreatmentAdjustmentSetPoints.doAdjustment(
+//                _treatmentAdjustmentSetPoints.treatmentModality     , // TODO
                 _treatmentAdjustmentSetPoints.bloodFlowRate         ,
                 _treatmentAdjustmentSetPoints.dialysateFlowRate     ,
                 _treatmentAdjustmentSetPoints.dialysateTemperature  ,
+//                _treatmentAdjustmentSetPoints.hepatitus               // TODO
                 _treatmentAdjustmentSetPoints.acidConcentrate       ,
                 _treatmentAdjustmentSetPoints.bicarbConcentrate
+//                _treatmentAdjustmentSetPoints.sodium                  // TODO
+//                _treatmentAdjustmentSetPoints.bicarboante             // TODO
             )
         }
     }
@@ -180,10 +195,6 @@
         }
     }
 
-    TreatmentAdjustmentDurationStack { id: _treatmentAdjustmentDuration }
-
-    TreatmentAdjustmentVitalsInterval { id: _treatmentAdjustmentVitalsInterval  }
-
     // ---------- Manages Responses ----------
     Connections { target: vTreatmentAdjustmentBolusVolume
         function onAdjustmentTriggered              ( vValue ) {
@@ -224,6 +235,15 @@
         function onInTreatmentChanged               ( vValue ) { page( _treatmentBloodPrime  , vValue   )}
     }
 
+    Connections { target: _treatmentHome
+        function onVisibleChanged                   ( vValue ) {
+            if (_treatmentHome.visible) {
+                _mainMenu.hidden = true
+                _headerBar.menuHidden = false
+            }
+        }
+    }
+
     Connections { target: _treatmentBloodPrime
         function onVisibleChanged                   ( vValue ) {
             if (_treatmentBloodPrime.visible) {
@@ -232,10 +252,28 @@
         }
     }
 
+    Connections { target: _endTreatmentRinsebackStack
+        function onVisibleChanged                   ( vValue ) {
+            if (_endTreatmentRinsebackStack.visible) {
+                _headerBar.menuHidden = true
+            }
+        }
+    }
+
+    Connections { target: _endTreatmentRecirculateStack
+        function onVisibleChanged                   ( vValue ) {
+            if (_endTreatmentRecirculateStack.visible) {
+                _headerBar.menuHidden = true
+            }
+        }
+    }
+
     Connections { target: vTDTreatmentStates
         // in-Treatmet
-        function onTxBloodPrimeChanged              ( vValue ) { page( _treatmentBloodPrime  , vValue           )}
-        function onTxDialysisChanged                ( vValue ) { page( _treatmentHome        , vValue           )}
-        function onTxEndChanged                     ( vValue ) { if ( vValue ) {  _endTreatmentDialog.open()    }}
+        function onTxBloodPrimeChanged              ( vValue ) { page( _treatmentBloodPrime             , vValue    )}
+        function onTxDialysisChanged                ( vValue ) { page( _treatmentHome                   , vValue    )}
+        function onTxEndChanged                     ( vValue ) { if ( vValue ) {  _endTreatmentDialog.open()        }}
+        function onTxRinsebackChanged               ( vValue ) { page( _endTreatmentRinsebackStack      , vValue    )}
+        function onTxRecirculateChanged             ( vValue ) { page( _endTreatmentRecirculateStack    , vValue    )}
     }
 }