Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -ref583f0056a0fb8c66a64e132be159719b2bc2f6 -r1286d74bd015276aab604808be2766136091c125
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 1286d74bd015276aab604808be2766136091c125)
@@ -50,12 +50,13 @@
         if (visible) {
             rebuildMap()
             _mainMenu.hidden = true
-            _headerBar.titleText = qsTr("Setup Treatment")
+            _headerBar.activeStack = stackView
             _root.stackStepIndex = 0
+            _headerBar.loggedUser =  vSettings.advancedMode ?  qsTr("[Advanced]") : ""
         }
         else {
             stackView.initialItem = null
-            _headerBar.titleText = ""
+            _headerBar.loggedUser = ""
         }
     }
 
@@ -149,9 +150,8 @@
         case PreTreatmentStack.Step.Installation:
             return _pretreatmentInstallation.confirmButtonText()
         case PreTreatmentStack.Step.CreateRx:
-            return vTreatmentCreate.parametersValidated
-                   ? qsTr("Confirm")
-                   : qsTr("Validate")
+            return _pretreatmentCreate.isFirstTab ? qsTr("Next") :
+                                                    qsTr("Confirm")
         case PreTreatmentStack.Step.Connect:
             return qsTr("Start")
         default:
@@ -162,9 +162,10 @@
     function backEnabled() {
         switch ( stepKeys[_root.stackStepIndex] ) {
         case PreTreatmentStack.Step.Concentrates:
-            return true
         case PreTreatmentStack.Step.Installation:
-            return _pretreatmentInstallation.backEnabled()
+            return true
+        case PreTreatmentStack.Step.CreateRx:
+            return ! _pretreatmentCreate.isFirstTab
         default:
             return false // majority of pages back is disabled
         }