Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -r1132f049e169cc87a059261f72fca0ceb7d739f1 -r52d17dab2211c2e4d9160c55c316ad7a40ce4d6c
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 1132f049e169cc87a059261f72fca0ceb7d739f1)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 52d17dab2211c2e4d9160c55c316ad7a40ce4d6c)
@@ -131,6 +131,9 @@
             if ( vSettings.advancedMode )   { vPreTreatmentAdjustmentInitTreatment.doCancel()   }
             else                            { _pretreatmentInstallation.backClicked()           }
             break
+        case PreTreatmentStack.Step.CreateRx:
+            _pretreatmentCreate.back()
+            break
         default:
             break
         }
@@ -142,9 +145,9 @@
         case PreTreatmentStack.Step.Installation:
             return _pretreatmentInstallation.confirmButtonText()
         case PreTreatmentStack.Step.CreateRx:
-            return vTreatmentCreate.parametersValidated
-                   ? qsTr("Confirm")
-                   : qsTr("Validate")
+            return _pretreatmentCreate.isFirstTab ? qsTr("Next") :
+                                                    vTreatmentCreate.parametersValidated ?  qsTr("Confirm") :
+                                                                                            qsTr("Validate")
         case PreTreatmentStack.Step.Connect:
             return qsTr("Start")
         default:
@@ -158,6 +161,8 @@
             return true
         case PreTreatmentStack.Step.Installation:
             return _pretreatmentInstallation.backEnabled()
+        case PreTreatmentStack.Step.CreateRx:
+            return ! _pretreatmentCreate.isFirstTab
         default:
             return false // majority of pages back is disabled
         }
@@ -193,10 +198,20 @@
         backEnabled     : _root.backEnabled()
         width           : _root.width
         stepNames       : _root.stepNames
-        subStepIndex    : isInstall ? _pretreatmentInstallation.subStepIndex + 1 : 0
+        subStepIndex    :   isInstall   ? _pretreatmentInstallation.subStepIndex + 1    :
+                            isCreateRx  ? _pretreatmentCreate.subStepIndex + 1          : 0
+
+        currentStep    :  {
+            let arr =Array(stepNames.length).fill(false)
+            if ( ! vSettings.advancedMode ) { arr[stepKeys.indexOf(PreTreatmentStack.Step.Installation)] = isInstall}
+            arr[stepKeys.indexOf(PreTreatmentStack.Step.CreateRx)] = isCreateRx
+            return arr
+        }
+
         subSteps        : {
             let arr =Array(stepNames.length).fill(0)
             if ( ! vSettings.advancedMode ) { arr[stepKeys.indexOf(PreTreatmentStack.Step.Installation)] = PreTreatmentInstallStack.Step.Count }
+            arr[stepKeys.indexOf(PreTreatmentStack.Step.CreateRx)] = PreTreatmentCreateContent.Page.Count
             return arr
         }
 
@@ -256,21 +271,6 @@
         }
     }
 
-    // TODO - keep for now Ultrafiltration is beingn moved into Create Rx
-//    Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit
-//        function onAdjustmentTriggered          ( vValue ) {
-//            // the maximum ultrafiltration volume has to be set/revert regardless
-//            vTreatmentUltrafiltration.maximum   = vPreTreatmentAdjustmentUltrafiltrationInit.volume
-
-//            // but only if it has been accepted it will navigate
-//            if ( vPreTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) {
-//            }
-//            else {
-//                _pretreatmentDialysateUf.reasonText = vPreTreatmentAdjustmentUltrafiltrationInit.text()
-//            }
-//        }
-//    }
-
     // start treatment
     Connections { target: vPreTreatmentAdjustmentStartTreatment
         function onAdjustmentTriggered          ( vValue ) {