Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -rcc7aae88f15228ff37b840946818692e444718bf -r41ba9331e6a540df0c8eced0c4d3b8684afa9afa
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision cc7aae88f15228ff37b840946818692e444718bf)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 41ba9331e6a540df0c8eced0c4d3b8684afa9afa)
@@ -29,17 +29,14 @@
 PreTreatmentBase { id: _root
     objectName: "_PreTreatmentCreate" // SquishQt testability
 
-    header.confirmVisible   : true
-    title.visible           : false
-    header.backVisible      : ! vTreatmentCreate.parametersValidated
-    header.confirmEnabled   : _preTreatmentCreateContent.confirmReady()
-    header.confirmText.text : vTreatmentCreate.parametersValidated ? qsTr("CONFIRM") :
-                                                                     qsTr("VALIDATE")
-    onConfirmClicked        : vTreatmentCreate.parametersValidated ? _preTreatmentCreateContent.confirm() :
-                                                                     _preTreatmentCreateContent.validate()
-    onBackClicked           : vPreTreatmentAdjustmentInitTreatment.doCancel()
+    onVisibleChanged: {
+        if (visible) { stackStepIndex = PreTreatmentStack.CreateRx }
+    }
 
-    function clear( vValue ) { if ( ! vValue ) return;  _preTreatmentCreateContent.clear()  }
+    function clear( vValue )        { if ( ! vValue ) return;  _preTreatmentCreateContent.clear()                       }
+    function confirmReady()         { return _preTreatmentCreateContent.confirmReady()                                  }
+    function confirmButtonClicked() { if (vTreatmentCreate.parametersValidated) { _preTreatmentCreateContent.confirm()  }
+                                      else                                      { _preTreatmentCreateContent.validate() }}
 
     PreTreatmentCreateContent { id: _preTreatmentCreateContent
         anchors {