Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -rf83c14046290cebcd5c9229e76f747e4af586698 -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision f83c14046290cebcd5c9229e76f747e4af586698)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -41,13 +41,16 @@
 
     property var currentScreen: stackView.currentItem
 
+    signal isCreateRx(bool vState) // pass upstream to HeaderBar
+
     stackView.initialItem   : _root.initialItem
 
     // Standby / Disinfection
     DisinfectStack                  { id: _disinfectStack                   }
     // Pre Treatment
-    PreTreatmentCreateStack         { id: _preTreatmentCreateStack          }
-    PreTreatmentStack               { id: _preTreatmentStack                }
+    PreTreatmentStack               { id: _preTreatmentStack
+        onIsCreateRxChanged     : _root.isCreateRx(_preTreatmentStack.isCreateRx)
+    }
     // In TreatmentStack
     TreatmentStack                  { id: _treatmentStack                   }
 
@@ -56,6 +59,7 @@
     EndTreatmentRecirculateStack    { id: _endTreatmentRecirculateStack     }
     EndTreatmentEndStack            { id: _endTreatmentEndStack             }
 
+
     // Post Treatment
     PostTreatmentStack              { id: _postTreatmentStack               }
 
@@ -110,7 +114,6 @@
     }
 
     MainHome                            { id: _mainHome
-        onStartTreatment                : { page( _treatmentStack                                               )} // TODO: Remove before merging into staging. Only needed for this branch
         onCreateTreatment               : { vPreTreatmentAdjustmentInitTreatment.doInitiate(                    )}
         onVisibleChanged: {
             if (visible) {
@@ -134,12 +137,11 @@
         }
 
         function onHomeChanged                  ( vValue ) { page( _startupScreen                   , vValue    )}
-        function onStandbyChanged               ( vValue ) { if ( vTDOpMode.standby ) _preTreatmentCreateStack.clear(vValue)         }
+        function onStandbyChanged               ( vValue ) { if ( vTDOpMode.standby ) _preTreatmentStack.clear(vValue)        }
         function onStandbyStartChanged          ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome.  */   }
         function onStandbyWaitTreatmentChanged  ( vValue ) { if ( vValue ) vDisinfectAdjustDisinfect.hasCancel  = false             }
         function onStandbyWaitDisinfectChanged  ( vValue ) { page( _disinfectStack                  , vValue    )}
 
-        function onValidateParametersChanged    ( vValue ) { page( _preTreatmentCreateStack         , vValue    )}
         function onPreTreatmentChanged          ( vValue ) { page( _preTreatmentStack               , vValue    )}
         function onInTreatmentChanged           ( vValue ) { page( _treatmentStack                  , vValue    )}
         function onPostTreatmentChanged         ( vValue ) { page( _postTreatmentStack              , vValue    )}
@@ -159,7 +161,6 @@
 
         function onTxRinsebackChanged           ( vValue ) { page( _endTreatmentRinsebackStack      , vValue    )}
         function onTxRecirculateChanged         ( vValue ) { page( _endTreatmentRecirculateStack    , vValue    )}
-        function onTxEndChanged                 ( vValue ) { page( _endTreatmentEndStack            , vValue    )}
 
         // Treatment Stop
         function onTxStopChanged                ( vValue ) { page( _treatmentStack                  , vValue    )}
@@ -174,4 +175,11 @@
             _mainHome.reasonText = vPreTreatmentAdjustmentInitTreatment.adjustment_ReasonText
         }
     }
+
+    Connections { target: _endTreatmentDialog
+        // End Treatment -> proceed to rinceback
+        function onAccepted () {
+            vTreatmentAdjustmentEnd.doAdjustment ()
+        }
+    }
 }