Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -ra55e0de27d8c427dd4d441f47bb22ca2fe0ca462 -r8a9a7d5cb3e54aa73e499ddec62653893e7d5ca7
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision a55e0de27d8c427dd4d441f47bb22ca2fe0ca462)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 8a9a7d5cb3e54aa73e499ddec62653893e7d5ca7)
@@ -135,20 +135,18 @@
             break
         case PreTreatmentStack.Step.WaterSample:
             vPreTreatmentAdjustmentWaterSample.doResult( _pretreatmentWaterSample.result          )
-            page ( _pretreatmentCreate )  // TODO remove when i do messaging
+            page ( _pretreatmentCreate )  // TODO remove when implementing messaging
             break
         case PreTreatmentStack.Step.CreateRx:
             _pretreatmentCreate.confirmButtonClicked()
             if ( vTreatmentCreate.parametersValidated ) { page ( _pretreatmentDialysateUf ) }
             break
         case PreTreatmentStack.Step.DialysateUF:
             vPreTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_pretreatmentDialysateUf.ufVolume)
-            page ( _pretreatmentConnect )  // TODO remove when i do messaging
+            page ( _pretreatmentConnect )  // TODO remove when implementing messaging
             break
         case PreTreatmentStack.Step.Connect:
             vPreTreatmentAdjustmentStartTreatment.doStart()
-            // TODO Keep for now until we figure out if this isnt going to be used anymore
-//            vPreTreatmentAdjustmentPatientConnectionConfirm.doConfirm()
             break
         default:
             break
@@ -199,7 +197,7 @@
 
     function confirmEnabled() {
         switch ( stepKeys[_root.stackStepIndex] ) {
-//        case PreTreatmentStack.Step.SelfTests:
+//        case PreTreatmentStack.Step.SelfTests:        // TODO set when implementing self test/ prime
 //            return _pretreatmentSelfTests.isComplete
 //        case PreTreatmentStack.Step.Prime:
 //            return _pretreatmentPrime.isComplete
@@ -230,7 +228,11 @@
         width           : _root.width
         stepNames       : _root.stepNames
         subStepIndex    : isInstall ? _pretreatmentInstallation.subStepIndex + 1 : 0
-        subStepsLength  : isInstall ? PreTreatmentInstallStack.Step.SubStepCount : 0
+        subSteps        : {
+            let arr =Array(stepNames.length).fill(0)
+            if ( ! vSettings.advancedMode ) { arr[stepKeys.indexOf(PreTreatmentStack.Step.Installation)] = PreTreatmentInstallStack.Step.Count }
+            return arr
+        }
 
         onBackClicked   : _root.backClicked()
         onConfirmClicked: _root.confirmClicked()