Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -ref583f0056a0fb8c66a64e132be159719b2bc2f6 -rfb3c31821213807fb8d0e40f4840181f370c23e4
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision fb3c31821213807fb8d0e40f4840181f370c23e4)
@@ -34,7 +34,6 @@
         Concentrates    ,
         Installation    ,
         SelfTests       ,
-        Saline          ,
         Prime           ,
         CreateRx        ,
         Connect
@@ -76,9 +75,6 @@
         keys.push(PreTreatmentStack.Step.SelfTests)
         values.push(qsTr("Self-Tests"))
 
-        keys.push(PreTreatmentStack.Step.Saline)
-        values.push(qsTr("Saline"))
-
         keys.push(PreTreatmentStack.Step.Prime)
         values.push(qsTr("Prime"))
 
@@ -107,9 +103,6 @@
             else                            { _pretreatmentInstallation.continueClicked()           }
             break
         case PreTreatmentStack.Step.SelfTests:
-            page ( _pretreatmentSaline )
-            break
-        case PreTreatmentStack.Step.Saline:
             page ( _pretreatmentPrime )
             break
         case PreTreatmentStack.Step.Prime:
@@ -138,6 +131,9 @@
             if ( vSettings.advancedMode )   { vPreTreatmentAdjustmentInitTreatment.doCancel()   }
             else                            { _pretreatmentInstallation.backClicked()           }
             break
+        case PreTreatmentStack.Step.CreateRx:
+            _pretreatmentCreate.back()
+            break
         default:
             break
         }
@@ -149,9 +145,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("Validate")
         case PreTreatmentStack.Step.Connect:
             return qsTr("Start")
         default:
@@ -165,6 +160,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
         }
@@ -200,10 +197,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
         }
 
@@ -225,11 +232,6 @@
         onVisibleChanged    : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.SelfTests);                     }
     }
 
-    PreTreatmentBase    { id:   _pretreatmentSaline
-        instructionBased    : true
-        onVisibleChanged    : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Saline);        updateModel()   }
-    }
-
     PreTreatmentPrime    { id:   _pretreatmentPrime
         onVisibleChanged    : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Prime);                         }
     }
@@ -245,8 +247,9 @@
 
     // Slots
     Connections { target: vTDOpMode
-        function onPreTreatmentChanged( vValue ) {  if ( vSettings.advancedMode )   { page ( _pretreatmentInstallation      , vValue    )}
-                                                    else                            { page ( _pretreatmentConcentrates      , vValue    )}
+        function onPreTreatmentChanged( vValue ) {  if ( ! vTreatmentCreate.txCode )    { vTreatmentCreate.generateTxCode()                  }
+                                                    if ( vSettings.advancedMode )       { page ( _pretreatmentInstallation      , vValue    )}
+                                                    else                                { page ( _pretreatmentConcentrates      , vValue    )}
         }
     }
 
@@ -267,21 +270,13 @@
         }
     }
 
-    // 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
+    // creat rx
+    Connections{ target: vTreatmentCreate
+        function onDidValidationPass            ( ) {
+            if ( _pretreatmentCreate.visible) { page ( _pretreatmentConnect ) }
+        }
+    }
 
-//            // 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 ) {