Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r72550dbbd6db8eab40aad38956b32f99416600c8
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision c70815ad2b3beadf61832f2e4d12eb90d476e020)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 72550dbbd6db8eab40aad38956b32f99416600c8)
@@ -49,9 +49,9 @@
         if (visible) {
             rebuildMap()
             _mainMenu.hidden = true
-            _headerBar.activeStack = stackView
+            _headerBar.activeStack = vSettings.advancedMode ? _pretreatmentInstallation.stackView : stackView
             _root.stackStepIndex = 0
-            _headerBar.userMode =  vSettings.advancedMode ?  qsTr("[Advanced]") : ""
+            _headerBar.userMode =  vSettings.advancedMode ?  qsTr("Advanced Mode") : ""
 
         }
         else {
@@ -227,12 +227,12 @@
     }
 
     // Pages
-    PreTreatmentBase            { id:   _pretreatmentConcentrates;  stepIndex:  PreTreatmentStack.Step.Concentrates;    instructionBased: true  }
-    PreTreatmentInstallStack    { id:   _pretreatmentInstallation;  stepIndex:  PreTreatmentStack.Step.Installation                             }
-    PreTreatmentSelfTests       { id:   _pretreatmentSelfTests;     stepIndex:  PreTreatmentStack.Step.SelfTests                                }
-    PreTreatmentPrime           { id:   _pretreatmentPrime;         stepIndex:  PreTreatmentStack.Step.Prime                                    }
-    PreTreatmentCreate          { id:   _pretreatmentCreate;        stepIndex:  PreTreatmentStack.Step.CreateRx                                 }
-    PreTreatmentBase            { id:   _pretreatmentConnect;       stepIndex:  PreTreatmentStack.Step.Connect;         instructionBased: true  }
+    PreTreatmentBase            { id:   _pretreatmentConcentrates;  stepIndex:  PreTreatmentStack.Step.Concentrates;                                        instructionBased: true  }
+    PreTreatmentInstallStack    { id:   _pretreatmentInstallation;  stepIndex:  PreTreatmentStack.Step.Installation                                                                 }
+    PreTreatmentSelfTests       { id:   _pretreatmentSelfTests;     stepIndex:  PreTreatmentStack.Step.SelfTests                                                                    }
+    PreTreatmentPrime           { id:   _pretreatmentPrime;         stepIndex:  PreTreatmentStack.Step.Prime                                                                        }
+    PreTreatmentCreate          { id:   _pretreatmentCreate;        stepIndex:  PreTreatmentStack.Step.CreateRx;        showCreateRxHeaderButton: false                             }
+    PreTreatmentBase            { id:   _pretreatmentConnect;       stepIndex:  PreTreatmentStack.Step.Connect;         showCreateRxHeaderButton: false;    instructionBased: true  }
 
     // Slots
     Connections { target: vTDOpMode