Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r1f9e84f74ead9e10577c8caa204c6eb911e12ab8 -reb3bbd3e203463dc3634ecb009b8a1390bb87012
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 1f9e84f74ead9e10577c8caa204c6eb911e12ab8)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision eb3bbd3e203463dc3634ecb009b8a1390bb87012)
@@ -56,7 +56,6 @@
         verticalAlignment   : Text.AlignVCenter
         font.pixelSize      : Fonts.fontHeaderbarTitle
         font.weight         : Font.DemiBold
-
     }
 
     Item { id: _dateTimeItem
Index: sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml
===================================================================
diff -u -re310a3245018c3b5405ccddeb899f9c5b8a94d78 -reb3bbd3e203463dc3634ecb009b8a1390bb87012
--- sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml	(.../AcidConcentrateAdjustment.qml)	(revision e310a3245018c3b5405ccddeb899f9c5b8a94d78)
+++ sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml	(.../AcidConcentrateAdjustment.qml)	(revision eb3bbd3e203463dc3634ecb009b8a1390bb87012)
@@ -40,7 +40,7 @@
                                 notificationText = ""
 
     Connections { target: vTDOpMode
-        function onPreTreatmentChanged() { if (vTDOpMode.preTreatment) { _root.close() } }
+        function onPreTreatmentChanged() { _root.close() }
     }
 
     Item { id : _contentItem
Index: sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml
===================================================================
diff -u -r04fd28f30e37a09450ff5877ae2f805a92898b44 -reb3bbd3e203463dc3634ecb009b8a1390bb87012
--- sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml	(.../PostTreatmentBase.qml)	(revision 04fd28f30e37a09450ff5877ae2f805a92898b44)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml	(.../PostTreatmentBase.qml)	(revision eb3bbd3e203463dc3634ecb009b8a1390bb87012)
@@ -29,14 +29,10 @@
     objectName: "_PostTreatmentBase"
     header.visible : false
 
-    onVisibleChanged: {
-        if (visible) {
-            _root.updateModel(stackStepIndex)
-        }
-    }
+    onVisibleChanged: if (visible) { _root.updateModel() }
 
-    function updateModel (index) {
-        let  group = stepNames[index]
+    function updateModel () {
+        let  group = stepNames[stackStepIndex]
         if ( group === undefined ) group = ""
         let instructionsGroup    = vSettings.instructions[group]
 
Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -r8457901952a1d732c4688da471ae98e1d4f3024f -reb3bbd3e203463dc3634ecb009b8a1390bb87012
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 8457901952a1d732c4688da471ae98e1d4f3024f)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision eb3bbd3e203463dc3634ecb009b8a1390bb87012)
@@ -28,7 +28,7 @@
  * \brief   the pre treatment stack screen
  */
 StackItem { id: _root
-    stackView.initialItem   : vSettings.advancedMode ? _pretreatmentInstallationAdv : _pretreatmentConcentrates
+    stackView.initialItem   :  null
     enum Step {             // All pretreatment steps advanced and standard
         Concentrates    ,
         Installation    ,
@@ -264,6 +264,12 @@
         }
     }
 
+    Connections { target: vTDOpMode
+        function onPreTreatmentChanged( vValue ) {  if ( vSettings.advancedMode )   { page ( _pretreatmentInstallationAdv   , vValue    )}
+                                                    else                            { page ( _pretreatmentConcentrates      , vValue    )}
+        }
+    }
+
     // TODO in pre treatment story
 //    Connections { target: vPreTreatmentStates
 //        function onWaterSampleChanged           ( vValue ) { page( _preTreatmentWaterSampleStack , vValue )}