Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -r72550dbbd6db8eab40aad38956b32f99416600c8 -rb1088e5b71c57d0436b5d376d87371d700865703
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 72550dbbd6db8eab40aad38956b32f99416600c8)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision b1088e5b71c57d0436b5d376d87371d700865703)
@@ -47,12 +47,12 @@
 
     onVisibleChanged: {
         if (visible) {
+            _headerbarPrescription.open()
             rebuildMap()
             _mainMenu.hidden = true
             _headerBar.activeStack = vSettings.advancedMode ? _pretreatmentInstallation.stackView : stackView
             _root.stackStepIndex = 0
             _headerBar.userMode =  vSettings.advancedMode ?  qsTr("Advanced Mode") : ""
-
         }
         else {
             stackView.initialItem = null
@@ -62,8 +62,8 @@
 
     stackView.onCurrentItemChanged: if ( stackView.currentItem != _pretreatmentInstallation ) { _headerBar.activeStack = stackView }
 
-    function setPage(vPage, vCondition) {
-        _root.stackStepIndex = _root.stepKeys.indexOf(vPage.stepIndex)
+    function setPage(vPage, vCondition=true) {
+        if ( vCondition ) { _root.stackStepIndex = _root.stepKeys.indexOf(vPage.stepIndex) }
         page( vPage , vCondition)
     }
 
@@ -277,15 +277,14 @@
         }
     }
 
-    // TODO - update in future story. Keep for now
- //    Connections { target: vPreTreatmentStates
- //        function onWaterSampleChanged           ( vValue ) { page( _preTreatmentWaterSampleStack , vValue )}
- //        function onSelfTestConsumablesChanged   ( vValue ) { page( _preTreatmentConsumablesStack , vValue )}
- //        function onSelfTestNoCartridgeChanged   ( vValue ) { page( _preTreatmentDisposablesStack , vValue )}
- //        function onInstallationChanged          ( vValue ) { page( _preTreatmentDisposablesStack , vValue )} // DEBUG: Experimental : console.debug("vinstallation       "
- //        function onSelfTestDryChanged           ( vValue ) { page( _pretreatmentPrimeStack       , vValue )}
- //        function onPrimeChanged                 ( vValue ) { page( _pretreatmentPrimeStack       , vValue )} // DEBUG: Experimental : console.debug("vprime              "
- //        function onRecirculateChanged           ( vValue ) { page( _pretreatmentPrimeStack       , vValue )} // DEBUG: Experimental : console.debug("vrecirculate        "
- //        function onPatientConnectionChanged     ( vValue ) { page( _pretreatmentConnectionStack  , vValue )}
- //    }
+    Connections { target: vPreTreatmentStates
+        function onInstallationChanged      ( vValue ) {    if ( vSettings.advancedMode ) { setPage ( _pretreatmentInstallation , vValue    )}
+                                                            else                          { setPage ( _pretreatmentConcentrates , vValue    )}  }
+        function onSelfTestDryChanged       ( vValue ) {                                    setPage( _pretreatmentSelfTests     , vValue    )   }
+        function onPrimeChanged             ( vValue ) {                                    setPage( _pretreatmentPrime         , vValue    )   }
+        function onRecirculateChanged       ( vValue ) {                                    /*Do Nothing*/                                      }
+        function onConfirmRxChanged         ( vValue ) {                                    setPage( _pretreatmentCreate        , vValue )      }
+        function onHeparinChanged           ( vValue ) {                                    /*Do Nothing*/                                      }
+        function onPatientConnectionChanged ( vValue ) {                                    setPage( _pretreatmentConnect       , vValue )      }
+    }
 }