Index: sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r31583497d6d26aa04e94f67a50bd3d939ee7ba9c
--- sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml	(.../PreTreatmentBase.qml)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml	(.../PreTreatmentBase.qml)	(revision 31583497d6d26aa04e94f67a50bd3d939ee7ba9c)
@@ -33,8 +33,8 @@
             qsTr("Consumables"      ),
             qsTr("Disposables"      ),
             qsTr("Prime"            ),
-            qsTr("Ultrafiltration"  ),
             qsTr("BP/HR"            ),
+            qsTr("Ultrafiltration"  ),
             qsTr("Connection"       ),
             qsTr("Start"            ),
         ]
Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r31583497d6d26aa04e94f67a50bd3d939ee7ba9c
--- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml	(.../PreTreatmentConnectionStack.qml)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml	(.../PreTreatmentConnectionStack.qml)	(revision 31583497d6d26aa04e94f67a50bd3d939ee7ba9c)
@@ -34,22 +34,16 @@
 
     property int stackStepIndex : 7
 
-    PreTreatmentUltrafiltration { id: _preTreatmentUltrafiltration
-        header.stepIndex        : 5
-        header.confirmVisible   : true
-        title.text              : qsTr("Ultrafiltration Setup")
-    }
-
     PreTreatmentBase { id: _preTreatmentVitals // BP/HR Entry
         function update(vSystolic, vDiastolic ,vHeartRate) {
             _bphrEntry.systolic   = vSystolic   ? vSystolic  : ""
             _bphrEntry.diastolic  = vDiastolic  ? vDiastolic : ""
             _bphrEntry.heartRate  = vHeartRate  ? vHeartRate : ""
         }
 
-        header.stepIndex        : 6
+        header.stepIndex        : 5
         header.confirmText.text : _bphrEntry.isValid ? qsTr("CONFIRM") : qsTr("SKIP")
-        header.backVisible      : true
+        header.backVisible      : false
         header.confirmVisible   : true
         title.text              : qsTr("BP/HR")
         BPHREntry { id: _bphrEntry
@@ -86,6 +80,13 @@
         }
     }
 
+    PreTreatmentUltrafiltration { id: _preTreatmentUltrafiltration
+        header.stepIndex        : 6
+        header.confirmVisible   : true
+        header.backVisible      : true
+        title.text              : qsTr("Ultrafiltration Setup")
+    }
+
     PreTreatmentBase { id: _preTreatmentPatientConnection
         header.stepIndex        : 7
         header.backVisible      : true
@@ -105,7 +106,7 @@
     }
 
     Connections { target: vPreTreatmentStates
-        function onPatientConnectionChanged     ( vValue ) { page( _preTreatmentUltrafiltration      , vValue   )}
+        function onPatientConnectionChanged     ( vValue ) { page( _preTreatmentVitals      , vValue   )}
     }
 
     Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit
@@ -115,7 +116,7 @@
             _preTreatmentUltrafiltration.ufVolume  = vPreTreatmentAdjustmentUltrafiltrationInit.volume
             // but only if it has been accepted it will navigate
             if ( vPreTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) {
-                page( _preTreatmentVitals )
+                page( _preTreatmentPatientConnection )
             }
             else {
                 _preTreatmentUltrafiltration.reasonText = vPreTreatmentAdjustmentUltrafiltrationInit.text()
@@ -124,17 +125,16 @@
     }
 
     Connections { target: _preTreatmentUltrafiltration
+        function onBackClicked                  ( vValue ) { page( _preTreatmentVitals                )}
         function onConfirmClicked               ( vValue ) { vPreTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_preTreatmentUltrafiltration.ufVolume)}
     }
 
     Connections { target: _preTreatmentVitals
-        function onBackClicked                  ( vValue ) { page( _preTreatmentUltrafiltration         )}
-        function onConfirmClicked               ( vValue ) { page( _preTreatmentPatientConnection       )
-        }
+        function onConfirmClicked               ( vValue ) { page( _preTreatmentUltrafiltration       )}
     }
 
     Connections { target: _preTreatmentPatientConnection
-        function onBackClicked                  ( vValue ) { page( _preTreatmentVitals                  )}
+        function onBackClicked                  ( vValue ) { page( _preTreatmentUltrafiltration                        )}
         function onConfirmClicked               ( vValue ) { vPreTreatmentAdjustmentPatientConnectionConfirm.doConfirm()}
     }