Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -ra25dee6ed9a8cd343056d92bc3a78617eed66a6f -r76f632ce5a9039ae662d9a52286079b772f8ae7f
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision a25dee6ed9a8cd343056d92bc3a78617eed66a6f)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 76f632ce5a9039ae662d9a52286079b772f8ae7f)
@@ -32,6 +32,7 @@
 import "qrc:/components"
 import "qrc:/pages/treatment/adjustments"
 import "qrc:/pages/pretreatment/create"
+import "qrc:/pages/posttreatment"
 
 /*!
  * \brief   TreatmentStack is the screen
@@ -90,7 +91,7 @@
     }
 
     TreatmentStart              { id:       _treatmentStart
-        onBackClicked           : popToItem(_treatmentHome)
+        onBackClicked           : pop( _treatmentHome )
         onSectionFlowClicked    : {
             _treatmentAdjustmentFlow.open()
         }
@@ -221,6 +222,9 @@
         }
     }
 
+    PostTreatmentRinseback   { id: _postTreatmentRinseback      }
+    PostTreatmentRecirculate { id: _postTreatmentRecirculate    }
+
     // ---------- Manages Responses ----------
     Connections { target: vTreatmentAdjustmentDuration
         onAdjustmentTriggered   : {
@@ -325,4 +329,30 @@
         onPop                  : { pop()                   }
         onShowTreatmentStart   : { push(_treatmentStart)   }
     }
+
+    Connections { target: vHDTreatmentStates
+        onTxStartChanged: {
+            console.debug(" ----- onTxStartChanged")
+            if ( vHDTreatmentStates.txStart ) {
+                back( _treatmentStart )
+            }
+        }
+
+        onTxRinsebackChanged: {
+            if ( vHDTreatmentStates.txRinseback ) {
+                push( _postTreatmentRinseback )
+                _treatmentMenu.hidden = true
+            }
+        }
+
+        onTxRecirculateChanged: {
+            if ( vHDTreatmentStates.txRecirculate ) {
+                // application state by design is navigating always from Rinseback to recirculate
+                // so always it is rinseback on top which has to be replaced by recirculate
+                // also we never go back to rinseback from recirculate and will go back to blood priming
+                replace( _postTreatmentRecirculate )
+                _treatmentMenu.hidden = true
+            }
+        }
+    }
 }