Index: sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml
===================================================================
diff -u -r8a9a7d5cb3e54aa73e499ddec62653893e7d5ca7 -r0975a67dd4e4673b9a7b226bfea02cbfa489c418
--- sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml	(.../PreTreatmentInstallStack.qml)	(revision 8a9a7d5cb3e54aa73e499ddec62653893e7d5ca7)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml	(.../PreTreatmentInstallStack.qml)	(revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418)
@@ -18,11 +18,18 @@
         BloodSetTubing          ,
         BloodLines              ,
         PressureLinesAndDialyzer,
+        SalineSubStitution      ,
         Count
     }
 
     property int subStepIndex: PreTreatmentInstallStack.Step.BloodSetTubing
 
+    onVisibleChanged: {
+        if (visible) {
+            _headerBar.activeStack = stackView
+        }
+    }
+
     signal goToNextStep()
     signal goToPreviousStep()
 
@@ -37,6 +44,9 @@
             page ( _preTreatmentPressureLinesAndDialyzer )
             break
         case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer:
+            page ( _pretreatmentSalineSubstitution )
+            break
+        case PreTreatmentInstallStack.Step.SalineSubStitution:
             goToNextStep ()
             break
         default:
@@ -50,50 +60,59 @@
             goToPreviousStep ()
             break
         case PreTreatmentInstallStack.Step.BloodLines:
-            // cannot go back from here
+            page ( _preTreatmentBloodSetTubing )
             break
         case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer:
             page ( _preTreatmentBloodLines )
             break
+        case PreTreatmentInstallStack.Step.SalineSubStitution:
+            page ( _preTreatmentPressureLinesAndDialyzer )
+            break
         default:
             break
         }
     }
 
     function confirmButtonText() {
+        if ( vSettings.advancedMode ) { return qsTr("Auto Load") }
+
         switch ( _root.subStepIndex ) {
         case PreTreatmentInstallStack.Step.BloodSetTubing:
             return qsTr("Auto Load")
         case PreTreatmentInstallStack.Step.BloodLines:
-        case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: // fall through
+        case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer:
+        case PreTreatmentInstallStack.Step.SalineSubStitution:                  // fall through
         default:
             return qsTr("Next")
         }
     }
 
-    function backEnabled() {
-        return subStepIndex !== PreTreatmentInstallStack.Step.BloodLines
-    }
-
     // ----- Screens definitions
     PreTreatmentBase { id: _preTreatmentBloodSetTubing
         instructionBased    : true
-        onVisibleChanged    : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodSetTubing ; updateModel()          }
+        onVisibleChanged    : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodSetTubing; updateModel()           }
         subStepName         : qsTr("Blood Tubing Set")
     }
 
     PreTreatmentBase { id: _preTreatmentBloodLines
         instructionBased        : true
-        onVisibleChanged    : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodLines ; updateModel()              }
+        onVisibleChanged    : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodLines ;    updateModel()           }
         subStepName         : qsTr("Bloodlines")
     }
 
     PreTreatmentBase { id: _preTreatmentPressureLinesAndDialyzer
         instructionBased        :  true
-        onVisibleChanged    : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.PressureLinesAndDialyzer ; updateModel()}
+        onVisibleChanged    : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.PressureLinesAndDialyzer; updateModel() }
         subStepName         : qsTr("Pressure Lines and Dialyzer")
     }
 
+    PreTreatmentBase { id: _pretreatmentSalineSubstitution
+        instructionBased    : true
+        onVisibleChanged    : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.SalineSubStitution;         updateModel()           }
+        subStepName         : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF ?   qsTr("Substitution") :
+                                                                                            qsTr("Saline")
+    }
+
     // blood tubing set auto-load
     Connections { target: vPreTreatmentAdjustmentDisposablesConfirm
         function onAdjustmentTriggered              ( vValue ) {