Index: sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml
===================================================================
diff -u -r8a9a7d5cb3e54aa73e499ddec62653893e7d5ca7 -r1286d74bd015276aab604808be2766136091c125
--- sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml	(.../PreTreatmentInstallStack.qml)	(revision 8a9a7d5cb3e54aa73e499ddec62653893e7d5ca7)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml	(.../PreTreatmentInstallStack.qml)	(revision 1286d74bd015276aab604808be2766136091c125)
@@ -23,6 +23,12 @@
 
     property int subStepIndex: PreTreatmentInstallStack.Step.BloodSetTubing
 
+    onVisibleChanged: {
+        if (visible) {
+            _headerBar.activeStack = stackView
+        }
+    }
+
     signal goToNextStep()
     signal goToPreviousStep()
 
@@ -31,14 +37,17 @@
     function continueClicked() {
         switch ( _root.subStepIndex ) {
         case PreTreatmentInstallStack.Step.BloodSetTubing:
-            vPreTreatmentAdjustmentDisposablesConfirm.doConfirm()
+            page ( _preTreatmentBloodLines )
             break
         case PreTreatmentInstallStack.Step.BloodLines:
             page ( _preTreatmentPressureLinesAndDialyzer )
             break
         case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer:
-            goToNextStep ()
+            page ( _pretreatmentSalineSubstitution )
             break
+        case PreTreatmentInstallStack.Step.SalineSubStitution:
+             vPreTreatmentAdjustmentDisposablesConfirm.doConfirm()
+            break
         default:
             break
         }
@@ -50,7 +59,7 @@
             goToPreviousStep ()
             break
         case PreTreatmentInstallStack.Step.BloodLines:
-            // cannot go back from here
+            page ( _preTreatmentBloodSetTubing )
             break
         case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer:
             page ( _preTreatmentBloodLines )
@@ -61,20 +70,19 @@
     }
 
     function confirmButtonText() {
+        if ( vSettings.advancedMode ) { return qsTr("Auto Load") }
+
         switch ( _root.subStepIndex ) {
-        case PreTreatmentInstallStack.Step.BloodSetTubing:
+        case PreTreatmentInstallStack.Step.SalineSubStitution:
             return qsTr("Auto Load")
+        case PreTreatmentInstallStack.Step.BloodSetTubing:
         case PreTreatmentInstallStack.Step.BloodLines:
-        case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: // fall through
+        case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer:    // fall through
         default:
             return qsTr("Next")
         }
     }
 
-    function backEnabled() {
-        return subStepIndex !== PreTreatmentInstallStack.Step.BloodLines
-    }
-
     // ----- Screens definitions
     PreTreatmentBase { id: _preTreatmentBloodSetTubing
         instructionBased    : true
@@ -99,8 +107,7 @@
         function onAdjustmentTriggered              ( vValue ) {
             if ( vPreTreatmentAdjustmentDisposablesConfirm.adjustment_Accepted ) {
                 _preTreatmentBloodSetTubing.reasonText     = ""
-                if ( vSettings.advancedMode )   { goToNextStep ()                   }
-                else                            { page ( _preTreatmentBloodLines )  }
+                goToNextStep ()
             } else {
                  _preTreatmentBloodSetTubing.reasonText    = vPreTreatmentAdjustmentDisposablesConfirm.text()
             }