Index: sources/gui/qml/dialogs/UfVolumeAdjustment.qml
===================================================================
diff -u -r773b0b83e72af1bdc50c2643459cb0ef19c02ee6 -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180
--- sources/gui/qml/dialogs/UfVolumeAdjustment.qml	(.../UfVolumeAdjustment.qml)	(revision 773b0b83e72af1bdc50c2643459cb0ef19c02ee6)
+++ sources/gui/qml/dialogs/UfVolumeAdjustment.qml	(.../UfVolumeAdjustment.qml)	(revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180)
@@ -60,6 +60,9 @@
             onDidChange     : function(vValue) {
                 if ( ! _preWeight.valid ) { vTreatmentCreate.ufPreWeightRejectionReason = Variables.noRejectReason }
                 value = vValue
+
+                // zero weight if UF volume is entered
+                vTreatmentCreate.ultrafiltrationVolume = 0
             }
         }
 
@@ -81,6 +84,9 @@
             onDidChange     : function(vValue) {
                 if ( ! _estimatedTargetWeight.valid ) { vTreatmentCreate.ufEstimatedTargetWeightRejectionReason = Variables.noRejectReason }
                 value = vValue
+
+                // zero weight if UF volume is entered
+                vTreatmentCreate.ultrafiltrationVolume = 0
             }
         }
     }
Index: sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml
===================================================================
diff -u -r29a44b6e5908da155195c138b5e522fa8ce90fb4 -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180
--- sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml	(.../HeaderbarPrescription.qml)	(revision 29a44b6e5908da155195c138b5e522fa8ce90fb4)
+++ sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml	(.../HeaderbarPrescription.qml)	(revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180)
@@ -22,18 +22,15 @@
 import "qrc:/pages/pretreatment/create"
 
 ModalDialog { id: _root
-    readonly property bool isConfirmed: vTreatmentCreate.parametersConfirmed
     readonly property bool isFirstTab : _headerbarPrescriptionContent.currentIndex === PreTreatmentCreateContent.PatientPrescription
 
     padding : Variables.defaultMargin
-    onOpened: _headerbarPrescriptionContent.canEdit( ! ( vTreatmentCreate.parametersValidated || vTreatmentCreate.parametersConfirmed ) )
+    onOpened: _headerbarPrescriptionContent.canEdit( ! vTreatmentCreate.parametersValidated )
 
-    onIsConfirmedChanged: if (isConfirmed) { _root.close() }
 
     Text { id: descriptiveText
         anchors {
             top         : parent.top
-//            topMargin           : -10
             left        : parent.left
             leftMargin  : Variables.defaultMargin * 5
         }
@@ -77,19 +74,17 @@
         text.text   : _root.isFirstTab ? qsTr("Next") :
                                          vTreatmentCreate.parametersValidated ? qsTr("Confirm") :
                                                                                 qsTr("Validate")
-        visible     : ! vTDOpMode.inTreatment && ! isConfirmed
+        visible     : ! vTDOpMode.inTreatment && ! vTreatmentCreate.parametersValidated
 
         onClicked   : {
             if ( _root.isFirstTab ) {
                 _headerbarPrescriptionContent.currentIndex = PreTreatmentCreateContent.TreatmentSettings
                 return
             }
 
-            if ( vTreatmentCreate.parametersValidated ) {
-                _headerbarPrescriptionContent.confirm()
-                _root.close()
+            if ( ! vTreatmentCreate.parametersValidated ) {
+                _headerbarPrescriptionContent.validate()
             }
-            else { _headerbarPrescriptionContent.validate() }
         }
     }
 }
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180
--- sources/gui/qml/main.qml	(.../main.qml)	(revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180)
@@ -206,7 +206,6 @@
                 vTreatmentVitals.doReset()
                 vTreatmentCreate.txCode = ""
                 vTreatmentCreate.parametersValidated = false
-                vTreatmentCreate.parametersConfirmed = false
             }
         }
     }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r0797b3a8c28ad756be125a91c45fb53a2783dc9a -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 0797b3a8c28ad756be125a91c45fb53a2783dc9a)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180)
@@ -121,9 +121,6 @@
         vTreatmentCreate.doValidation       (        )
     }
 
-    function confirm () { vTreatmentCreate.doConfirm() } /// TODO: Remove later.. keeping for now (only in popup) to get into main tx on device
-
-
     Connections { target: vTDOpMode
         function onPreTreatmentChanged( vValue ) {
             if ( vValue ) {
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml
===================================================================
diff -u -r0797b3a8c28ad756be125a91c45fb53a2783dc9a -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision 0797b3a8c28ad756be125a91c45fb53a2783dc9a)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180)
@@ -277,6 +277,10 @@
             onDidChange         : function(vValue) {
                 if ( ! _ufVolume.valid ) { vTreatmentCreate.ufVolumeRejectionReason = Variables.noRejectReason }
                 vTreatmentCreate.ultrafiltrationVolume = vValue
+
+                // zero weight if UF volume is entered
+                vTreatmentCreate.ufEstimatedTargetWeight    = 0
+                vTreatmentCreate.ufPreWeight                = 0
             }
 
             onEditClicked   :_ufVolumeAdjustment.open()
Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -r0d1a10c754665f397bf7e507643d928657ed9561 -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180
--- sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 0d1a10c754665f397bf7e507643d928657ed9561)
+++ sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180)
@@ -67,7 +67,6 @@
     data.mUFEstimatedTargetWeight           = _ufEstimatedTargetWeight          ;
     data.mUFVolume                          = _ultrafiltrationVolume            ;
 
-    parametersConfirmed(false);
     parametersValidated(false);
     emit didAdjustment(data);
 }
@@ -81,7 +80,6 @@
 void VTreatmentCreate::doConfirm() {
     AdjustParametersConfirmRequestData  confirmTreatmentRequest;
     confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eConfirm;
-    parametersConfirmed(true);
     emit didAdjustment(confirmTreatmentRequest);
 }
 
@@ -95,7 +93,6 @@
     AdjustParametersConfirmRequestData  confirmTreatmentRequest;
     confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eCancel;
     parametersValidated(false);
-    parametersConfirmed(false);
     emit didAdjustment(confirmTreatmentRequest);
 }
 
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r0d1a10c754665f397bf7e507643d928657ed9561 -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 0d1a10c754665f397bf7e507643d928657ed9561)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180)
@@ -106,7 +106,6 @@
 
     VALUESET(QString    , patientID                                     ,"")
     VALUESET(bool       , parametersValidated                           , 0)
-    VALUESET(bool       , parametersConfirmed                           , 0)
 
     VALUESET(qint32     , actualRORejectionPercentage                   , 0)  // TODO comes from FP Update Later