Index: leahi.qrc
===================================================================
diff -u -rdfb5f7070961fd2a34c2cb8d897ecc43c4f46598 -rbe078c5a3e044ad1d943525dd6c50124d2f78905
--- leahi.qrc	(.../leahi.qrc)	(revision dfb5f7070961fd2a34c2cb8d897ecc43c4f46598)
+++ leahi.qrc	(.../leahi.qrc)	(revision be078c5a3e044ad1d943525dd6c50124d2f78905)
@@ -39,6 +39,8 @@
         <file alias="AcidConcentrateAdjustment.qml">sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml</file>
         <file alias="EndTreatmentDialog.qml">sources/gui/qml/dialogs/EndTreatmentDialog.qml</file>
         <file alias="RinsebackCompleteDialog.qml">sources/gui/qml/dialogs/RinsebackCompleteDialog.qml</file>
+        <file alias="UfVolumeAdjustment.qml">sources/gui/qml/dialogs/UfVolumeAdjustment.qml</file>
+        <file alias="HeparinRxAdjustment.qml">sources/gui/qml/dialogs/HeparinRxAdjustment.qml</file>
     </qresource>
     <qresource prefix="/dialogs/diagnostics">
         <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml</file>
@@ -122,6 +124,7 @@
         <file alias="iWaterSample">resources/images/water_sample.png</file>
         <file alias="iArrowDownDisabled">resources/images/ArrowDownDisabled.png</file>
         <file alias="iArrowUpDisabled">resources/images/ArrowUpDisabled.png</file>
+        <file alias="iEditYellow">resources/images/edit_yellow.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -270,6 +273,8 @@
     <qresource prefix="/pages/pretreatment/create">
         <file alias="PreTreatmentCreate.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml</file>
         <file alias="PreTreatmentCreateContent.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml</file>
+        <file alias="PreTreatmentCreatePatientPrescription.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml</file>
+        <file alias="PreTreatmentCreateTreatmentSettings.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml</file>
     </qresource>
     <qresource prefix="/pages/treatment">
         <file alias="TreatmentStack.qml">sources/gui/qml/pages/treatment/TreatmentStack.qml</file>
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -rd4b7643b0a19278ea948a75553ff777e4e436c22 -rbe078c5a3e044ad1d943525dd6c50124d2f78905
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision d4b7643b0a19278ea948a75553ff777e4e436c22)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision be078c5a3e044ad1d943525dd6c50124d2f78905)
@@ -198,6 +198,9 @@
     readonly property int adjustmentLabelUnitContainerWidth     : 720
     readonly property int institutionaltContainerHeight         : 69
 
+    readonly property int createRxLabelUnitContainerHeight      : 79 // 85
+    readonly property int createRxLabelUnitContainerWidth       : 770
+
     readonly property real sliderDefaultRoundTickMarkDiameter   : 5
     readonly property int sliderDefaultBodyHeight               : 15
 
@@ -262,8 +265,11 @@
     readonly property int   substitutionPrecision   : 1
 
     // conductivity
-    readonly property int   conductivityPrecision    : 1
+    readonly property int   conductivityPrecision   : 1
 
+    // weight
+    readonly property int   weightPrecision         : 1
+
     function sizeConverted(vSize, vSizePowers, vRound = 2) {
         return (  vSize
                 / vSizePowers   // convert from byte to Giga byte
@@ -323,6 +329,8 @@
     readonly property string unitTextFluid                  : qsTr("mL")
     readonly property string unitTextSaline                 : unitTextFluid
     readonly property string unitTextHeparin                : unitTextFluid
+    readonly property string unitWeight                     : qsTr("Kg")
+
     // - Pressure
     readonly property string unitTextPressure               : qsTr("mmHg")
     // - Temperature
Index: sources/gui/qml/pages/treatment/TreatmentHeparin.qml
===================================================================
diff -u -rd4b7643b0a19278ea948a75553ff777e4e436c22 -rbe078c5a3e044ad1d943525dd6c50124d2f78905
--- sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision d4b7643b0a19278ea948a75553ff777e4e436c22)
+++ sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision be078c5a3e044ad1d943525dd6c50124d2f78905)
@@ -47,9 +47,9 @@
                                               isPaused      ? qsTr("Pause")     :
                                               isCompleted   ? qsTr("Complete")  :  qsTr("Active")
 
-    readonly property var titles        : [  qsTr("Heparin Type"),                                              qsTr("Dispensing Rate"),                qsTr("Bolus Volume"),                   qsTr("Stop Time")                   ]
-    readonly property var units         : [ Variables.unitHeparinType,                                          Variables.unitTextDispensingRate,       Variables.unitTextDispensingRate,       Variables.unitTextDuration          ]
-    readonly property var values        : [ vTreatmentRanges.heparinTypeOptions[vTreatmentCreate.heparinType],  vTreatmentCreate.heparinDispensingRate, vTreatmentCreate.heparinBolusVolume,    vTreatmentCreate.heparinStopTime    ]
+    readonly property var titles        : [  qsTr("Heparin Type"),                                              qsTr("Dispensing Rate"),                qsTr("Bolus Volume"),                   qsTr("Stop Time")                       ]
+    readonly property var units         : [ Variables.unitHeparinType,                                          Variables.unitTextDispensingRate,       Variables.unitTextDispensingRate,       Variables.unitTextDuration              ]
+    readonly property var values        : [ vTreatmentRanges.heparinTypeOptions[vTreatmentCreate.heparinType],  vTreatmentCreate.heparinDispensingRate, vTreatmentCreate.heparinBolusVolume,    vTreatmentCreate.heparinDeliveryDuration]
 
     readonly property real cumulative       : vTreatmentHeparin.cumulative
     readonly property real target           : vTreatmentHeparin.target