Index: sources/gui/qml/components/ModalDialog.qml
===================================================================
diff -u -r0797b3a8c28ad756be125a91c45fb53a2783dc9a -rdcd977aa407345edac30e4430a0476de4b0163d8
--- sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision 0797b3a8c28ad756be125a91c45fb53a2783dc9a)
+++ sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision dcd977aa407345edac30e4430a0476de4b0163d8)
@@ -47,8 +47,8 @@
     x: Math.round((Variables.applicationWidth - width) / 2)
     y: Math.round((Variables.applicationHeight - height) / 2)
 
-    enter: Transition { NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 200 } }
-    exit : Transition { NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 200 } }
+    enter: Transition { NumberAnimation { property: "scale"; from: 0.8; to: 1.0; duration: 200; easing.type: Easing.OutCubic    } }
+    exit : Transition { NumberAnimation { property: "scale"; from: 1.0; to: 0.8; duration: 200; easing.type: Easing.InCubic     } }
 
     modal: true
 
@@ -58,7 +58,7 @@
         anchors.bottomMargin: _alarmBar.visible ? Variables.notificationHeight : 0
         color               : "#99000000"
 
-        Behavior on opacity { NumberAnimation { duration: 300} }
+        Behavior on opacity { NumberAnimation { duration: 200} }
     }
 
     background: Rectangle { id: _backgroundRect
Index: sources/gui/qml/dialogs/HeparinRxAdjustment.qml
===================================================================
diff -u -r58d24875f4e9c0115a05cae01b4a4e0a26818396 -rdcd977aa407345edac30e4430a0476de4b0163d8
--- sources/gui/qml/dialogs/HeparinRxAdjustment.qml	(.../HeparinRxAdjustment.qml)	(revision 58d24875f4e9c0115a05cae01b4a4e0a26818396)
+++ sources/gui/qml/dialogs/HeparinRxAdjustment.qml	(.../HeparinRxAdjustment.qml)	(revision dcd977aa407345edac30e4430a0476de4b0163d8)
@@ -180,6 +180,7 @@
         width       : Variables.defaultButtonWidth
         height      : Variables.defaultButtonHeight
         enabled     : _heparinBolusVolume.isActive && _heparinDispensingRate.isActive && _heparinDeliveryDuration.isActive
+        visible     : ! vTreatmentCreate.parametersValidated
 
         anchors {
             top     : undefined
Index: sources/gui/qml/dialogs/UfVolumeAdjustment.qml
===================================================================
diff -u -r81ed00031f6f2b4124a17ac8054b4a3815e2e2bc -rdcd977aa407345edac30e4430a0476de4b0163d8
--- sources/gui/qml/dialogs/UfVolumeAdjustment.qml	(.../UfVolumeAdjustment.qml)	(revision 81ed00031f6f2b4124a17ac8054b4a3815e2e2bc)
+++ sources/gui/qml/dialogs/UfVolumeAdjustment.qml	(.../UfVolumeAdjustment.qml)	(revision dcd977aa407345edac30e4430a0476de4b0163d8)
@@ -73,8 +73,8 @@
             unitText        : Variables.unitWeight
             valid           : ! vTreatmentCreate.ufEstimatedTargetWeightRejectionReason
             editable        : _root.editingEnabled
-            minimum         : _preWeight.value
-            maximum         : vTreatmentRanges.weightMax
+            minimum         : vTreatmentRanges.weightMin
+            maximum         : _preWeight.value
             step            : vTreatmentRanges.weightRes
             defaultValue    : vTreatmentRanges.weightDef
             decimal         : Variables.weightPrecision
@@ -101,6 +101,7 @@
         width       : Variables.defaultButtonWidth
         height      : Variables.defaultButtonHeight
         enabled     : _preWeight.isActive && _estimatedTargetWeight.isActive
+        visible     : ! vTreatmentCreate.parametersValidated
 
         anchors {
             top     : undefined
Index: sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml
===================================================================
diff -u -r83acad721bd36d2c88a15feddd6812d2e591bef3 -rdcd977aa407345edac30e4430a0476de4b0163d8
--- sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml	(.../HeaderbarPrescription.qml)	(revision 83acad721bd36d2c88a15feddd6812d2e591bef3)
+++ sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml	(.../HeaderbarPrescription.qml)	(revision dcd977aa407345edac30e4430a0476de4b0163d8)
@@ -31,13 +31,15 @@
     Text { id: descriptiveText
         anchors {
             top         : parent.top
+            topMargin   : 10
             left        : parent.left
             leftMargin  : Variables.defaultMargin * 5
         }
-        text            : qsTr("[Original Prescribed Parameters]")
+        text            : qsTr("*Original Prescribed Parameters")
         visible         :  vTDOpMode.inTreatment
         color           : Colors.mainTreatmentOrange
         font.pixelSize  : 24
+        font.weight     : Font.Medium
     }
 
     PreTreatmentCreateContent { id: _headerbarPrescriptionContent
@@ -71,16 +73,14 @@
             rightMargin     : Variables.defaultMargin * 3
         }
         enabled     : _root.isFirstTab ? true : _headerbarPrescriptionContent.confirmReady()
-        text.text   : _root.isFirstTab ? qsTr("Next") : qsTr("Validate")
+        text.text   : _root.isFirstTab ? qsTr("Next") : qsTr("Confirm")
         visible     : ! vTDOpMode.inTreatment && ! vTreatmentCreate.parametersValidated
 
         onClicked   : {
             if ( _root.isFirstTab ) {
                 _headerbarPrescriptionContent.currentIndex = PreTreatmentCreateContent.TreatmentSettings
-                return
             }
-
-            if ( ! vTreatmentCreate.parametersValidated ) {
+            else {
                 _headerbarPrescriptionContent.validate()
             }
         }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r83acad721bd36d2c88a15feddd6812d2e591bef3 -rdcd977aa407345edac30e4430a0476de4b0163d8
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 83acad721bd36d2c88a15feddd6812d2e591bef3)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision dcd977aa407345edac30e4430a0476de4b0163d8)
@@ -29,7 +29,7 @@
 PreTreatmentBase { id: _root
     objectName: "_PreTreatmentCreate" // SquishQt testability
     readonly property bool isFirstTab   : _preTreatmentCreateContent.currentIndex === PreTreatmentCreateContent.PatientPrescription
-    property int subStepIndex           :_preTreatmentCreateContent.currentIndex
+    property int subStepIndex           : _preTreatmentCreateContent.currentIndex
 
     function clear( vValue )        { if ( ! vValue ) return;  _preTreatmentCreateContent.clear()                                                               }
     function confirmReady()         { return _root.isFirstTab ? true : _preTreatmentCreateContent.confirmReady()                                                }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r58d24875f4e9c0115a05cae01b4a4e0a26818396 -rdcd977aa407345edac30e4430a0476de4b0163d8
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 58d24875f4e9c0115a05cae01b4a4e0a26818396)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision dcd977aa407345edac30e4430a0476de4b0163d8)
@@ -115,8 +115,8 @@
     }
 
     function validate () {
-        vTreatmentCreate                    .patientID = _preTreatmentCreateTreatmentSettings.patientID
-        vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreateTreatmentSettings.patientID // store for the TreatmentLog
+        vTreatmentCreate                    .patientID = _preTreatmentCreatePatientPrescription.patientID
+        vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreatePatientPrescription.patientID // store for the TreatmentLog
 
         vTreatmentCreate.doValidation       (        )
     }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
===================================================================
diff -u -raf80aaa1c114eab78444e973c86b3c42dd85ef52 -rdcd977aa407345edac30e4430a0476de4b0163d8
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision af80aaa1c114eab78444e973c86b3c42dd85ef52)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision dcd977aa407345edac30e4430a0476de4b0163d8)
@@ -178,7 +178,7 @@
             step            : vTreatmentRanges.substitutionVolumeRes
             defaultValue    : vTreatmentRanges.substitutionVolumeDef
             decimal         : Variables.substitutionPrecision
-            value           : vTreatmentCreate.substitutionFluidVolume
+            value           : _root.isHDFFeatured ? vTreatmentCreate.substitutionFluidVolume : 0
             isActive        : vTreatmentCreate.substitutionFluidVolumeSet
 
             onDidActiveChange   : function(vState) {  vTreatmentCreate.substitutionFluidVolumeSet = vState }
@@ -294,7 +294,7 @@
             visible         : _root.heparinFeatured
             showEdit        : true
             needsAttention  : ! _heparinRxAdjustment.confirmReady()
-            editEnabled     : _heparinRxControl.value === PreTreatmentCreateTreatmentSettings.ON
+            editEnabled     : _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON
 
             function reset() {
                 vTreatmentCreate.heparinBolusVolume       = 0
@@ -313,7 +313,7 @@
                         _heparinRxAdjustment.open()
                     }
                     else {
-                        reset()
+                        _heparinRx.reset()
                     }
                 }
             }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml
===================================================================
diff -u -raf80aaa1c114eab78444e973c86b3c42dd85ef52 -rdcd977aa407345edac30e4430a0476de4b0163d8
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision af80aaa1c114eab78444e973c86b3c42dd85ef52)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision dcd977aa407345edac30e4430a0476de4b0163d8)
@@ -98,7 +98,7 @@
             isActive        : vTreatmentCreate.bicarbonateSet
             onDidActiveChange   : function(vState) {  vTreatmentCreate.bicarbonateSet = vState }
             onDidChange         : function(vValue) {
-                if ( ! _sodium.valid ) { vTreatmentCreate.bicarbonateRejectReason = Variables.noRejectReason }
+                if ( ! _bicarbonate.valid ) { vTreatmentCreate.bicarbonateRejectReason = Variables.noRejectReason }
                 vTreatmentCreate.bicarbonate = vValue
             }
         }