Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -ra8c7ca4936378f104565408a48127e9a8a90495f -r8457901952a1d732c4688da471ae98e1d4f3024f
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision a8c7ca4936378f104565408a48127e9a8a90495f)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 8457901952a1d732c4688da471ae98e1d4f3024f)
@@ -28,8 +28,8 @@
  * \brief   the pre treatment stack screen
  */
 StackItem { id: _root
-    stackView.initialItem   : vSettings.userMode ? _pretreatmentInstallationAdv : _pretreatmentConcentrates
-    enum Step {             // All pretreatment steps
+    stackView.initialItem   : vSettings.advancedMode ? _pretreatmentInstallationAdv : _pretreatmentConcentrates
+    enum Step {             // All pretreatment steps advanced and standard
         Concentrates    ,
         Installation    ,
         SelfTests       ,
@@ -85,7 +85,7 @@
             qsTr("Connect"      ),
         ]
 
-    property var stepNames              : vSettings.userMode ? stepNamesAdvanced : stepNamesStandard
+    property var stepNames              : vSettings.advancedMode ? stepNamesAdvanced : stepNamesStandard
     property int stepLineLength         : 100
     property int stackStepIndex         : 0
     readonly property bool isCreateRx   :  mappedStep() === PreTreatmentStack.Step.CreateRx
@@ -102,8 +102,10 @@
         }
     }
 
+    // clear create rx parameters
     function clear(vValue) { if ( ! vValue ) return;  _pretreatmentCreate.clear(vValue) }
 
+    // handle confirm clicked on any pretreatment page
     function confirmClicked() {
         switch ( mappedStep() ) {
         case PreTreatmentStack.Step.Concentrates:
@@ -120,24 +122,26 @@
         }
     }
 
+    // handle back clicked on any pretreatment page
     function backClicked() {
         switch ( mappedStep() ) {
         case PreTreatmentStack.Step.Concentrates:
             vPreTreatmentAdjustmentInitTreatment.doCancel() // request standby
             break
         case PreTreatmentStack.Step.Installation:
-            if ( vSettings.userMode )   { vPreTreatmentAdjustmentInitTreatment.doCancel()   }
-            else                        { page ( _pretreatmentConcentrates )                }
+            if ( vSettings.advancedMode )   { vPreTreatmentAdjustmentInitTreatment.doCancel()   }
+            else                            { page ( _pretreatmentConcentrates )                }
             break
         case PreTreatmentStack.Step.CreateRx:
-            if ( vSettings.userMode )   { page ( _pretreatmentInstallationAdv )             }
-            else                        { page ( _pretreatmentInstallation    )             }
+            if ( vSettings.advancedMode )   { page ( _pretreatmentInstallationAdv )             }
+            else                            { page ( _pretreatmentInstallation    )             }
             break
         default:
             break
         }
     }
 
+    // handle text for the confirm button on any pretreatment page
     function confirmButtonText() {
         switch ( mappedStep() ) {
         case PreTreatmentStack.Step.Concentrates:
@@ -153,15 +157,25 @@
         }
     }
 
-    // method to map stackstep to internal normalized step
+    // method to map each step advanced or standard to an internal normalized step
     function mappedStep() {
-        if ( vSettings.userMode ) {
+        if ( vSettings.advancedMode ) {
             // Advanced
             switch ( _root.stackStepIndex ) {
             case PreTreatmentStack.AdvancedSteps.Installation:
                 return PreTreatmentStack.Step.Installation
+            case PreTreatmentStack.AdvancedSteps.SelfTests:
+                return PreTreatmentStack.Step.SelfTests
+            case PreTreatmentStack.AdvancedSteps.Saline:
+                return PreTreatmentStack.Step.Saline
+            case PreTreatmentStack.AdvancedSteps.Prime:
+                return PreTreatmentStack.Step.Prime
             case PreTreatmentStack.AdvancedSteps.CreateRx:
                 return PreTreatmentStack.Step.CreateRx
+            case PreTreatmentStack.AdvancedSteps.UF:
+                return PreTreatmentStack.Step.UF
+            case PreTreatmentStack.AdvancedSteps.Connect:
+                return PreTreatmentStack.Step.Connect
             default:
                 return -1
             }
@@ -172,8 +186,20 @@
                 return PreTreatmentStack.Step.Concentrates
             case PreTreatmentStack.StandardSteps.Installation:
                 return PreTreatmentStack.Step.Installation
+            case PreTreatmentStack.StandardSteps.SelfTests:
+                return PreTreatmentStack.Step.SelfTests
+            case PreTreatmentStack.StandardSteps.Saline:
+                return PreTreatmentStack.Step.Saline
+            case PreTreatmentStack.StandardSteps.Prime:
+                return PreTreatmentStack.Step.Prime
+            case PreTreatmentStack.StandardSteps.WaterSample:
+                return PreTreatmentStack.Step.WaterSample
             case PreTreatmentStack.StandardSteps.CreateRx:
                 return PreTreatmentStack.Step.CreateRx
+            case PreTreatmentStack.StandardSteps.UF:
+                return PreTreatmentStack.Step.UF
+            case PreTreatmentStack.StandardSteps.Connect:
+                return PreTreatmentStack.Step.Connect
             default:
                 return -1
             }
@@ -199,11 +225,6 @@
         onConfirmClicked: _root.confirmClicked()
     }
 
-    // TODO in pre treatment story
-//    PreTreatmentWaterSampleStack{ id: _preTreatmentWaterSampleStack     ;objectName: "_preTreatmentWaterSampleStack" }
-//    PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack     ;objectName: "_preTreatmentConsumablesStack" }
-//    PreTreatmentPrimeStack      { id: _pretreatmentPrimeStack           ;objectName: "_pretreatmentPrimeStack"       }
-//    PreTreatmentConnectionStack { id: _pretreatmentConnectionStack      ;objectName: "_pretreatmentConnectionStack " }
     PreTreatmentBase    { id:   _pretreatmentConcentrates
         instructionBased    : true
         onVisibleChanged    : if (visible) { _root.stackStepIndex = PreTreatmentStack.StandardSteps.Concentrates; updateModel() }
@@ -220,19 +241,25 @@
     }
 
     PreTreatmentCreate  { id:   _pretreatmentCreate
-        onVisibleChanged    : if (visible) { vSettings.userMode ? _root.stackStepIndex = PreTreatmentStack.AdvancedSteps.CreateRx :
-                                                                  _root.stackStepIndex = PreTreatmentStack.StandardSteps.CreateRx }
+        onVisibleChanged    : if (visible) { vSettings.advancedMode ?   _root.stackStepIndex = PreTreatmentStack.AdvancedSteps.CreateRx :
+                                                                        _root.stackStepIndex = PreTreatmentStack.StandardSteps.CreateRx }
     }
 
+    // TODO in pre treatment story
+//    PreTreatmentWaterSampleStack{ id: _preTreatmentWaterSampleStack     ;objectName: "_preTreatmentWaterSampleStack" }
+//    PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack     ;objectName: "_preTreatmentConsumablesStack" }
+//    PreTreatmentPrimeStack      { id: _pretreatmentPrimeStack           ;objectName: "_pretreatmentPrimeStack"       }
+//    PreTreatmentConnectionStack { id: _pretreatmentConnectionStack      ;objectName: "_pretreatmentConnectionStack " }
+
     Connections { target: vPreTreatmentAdjustmentDisposablesConfirm
         function onAdjustmentTriggered              ( vValue ) {
             if ( vPreTreatmentAdjustmentDisposablesConfirm.adjustment_Accepted ) {
-                if ( vSettings.userMode ) { _pretreatmentInstallationAdv.informationText    = "" }
-                else                      { _pretreatmentInstallation.informationText       = "" }
+                if ( vSettings.advancedMode )   { _pretreatmentInstallationAdv.informationText    = "" }
+                else                            { _pretreatmentInstallation.informationText       = "" }
                 page ( _pretreatmentCreate ) // TODO fix in pre treatment.. Skip to create for now
             } else {
-                if ( vSettings.userMode ) { _pretreatmentInstallationAdv.informationText = vPreTreatmentAdjustmentDisposablesConfirm.text() }
-                else                      { _pretreatmentInstallation.informationText    = vPreTreatmentAdjustmentDisposablesConfirm.text() }
+                if ( vSettings.advancedMode )   { _pretreatmentInstallationAdv.informationText = vPreTreatmentAdjustmentDisposablesConfirm.text() }
+                else                            { _pretreatmentInstallation.informationText    = vPreTreatmentAdjustmentDisposablesConfirm.text() }
             }
         }
     }