Index: SDDs/VitalsLayout.png
===================================================================
diff -u
Binary files differ
Index: sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml
===================================================================
diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -r0c448ff97fb2882b068cf6da24bbed375fc68f44
--- sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml	(.../HeaderbarPrescription.qml)	(revision 40ddf63592b60608ae34aeb3099fe4e62ae45054)
+++ sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml	(.../HeaderbarPrescription.qml)	(revision 0c448ff97fb2882b068cf6da24bbed375fc68f44)
@@ -61,7 +61,14 @@
         }
         enabled     : _headerbarPrescriptionContent.confirmReady()
         text.text   : vTreatmentCreate.parametersValidated ? qsTr("CONFIRM") : qsTr("VALIDATE")
-        onClicked   : vTreatmentCreate.parametersValidated ? _headerbarPrescriptionContent.confirm() : _headerbarPrescriptionContent.validate()
-        visible     : ! vTDOpMode.inTreatment
+        visible     : ! vTDOpMode.inTreatment && ! isConfirmed
+
+        onClicked   : {
+            if ( vTreatmentCreate.parametersValidated ) {
+                _headerbarPrescriptionContent.confirm()
+                _root.close()
+            }
+            else { _headerbarPrescriptionContent.validate() }
+        }
     }
 }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -rbe918124565d9f0add371e25782804f19e0cba17 -r0c448ff97fb2882b068cf6da24bbed375fc68f44
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision be918124565d9f0add371e25782804f19e0cba17)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 0c448ff97fb2882b068cf6da24bbed375fc68f44)
@@ -39,7 +39,7 @@
 
     onIsValidatedChanged : canEdit ( ! isValidated )
 
-    function canEdit  (state) { editingEnabled = state  }
+    function canEdit  (state) { editingEnabled = state && ! vTDOpMode.inTreatment }
 
     function activateAndRefresh() {
         refreshAll () // needs to be first
@@ -142,6 +142,7 @@
     Connections {  target: _acidConcentrateAdjustment
         function onAccepted () {
             vTreatmentCreate.acidConcentrate      = _acidConcentrateComboBox.find(_acidConcentrateAdjustment.adjustment)
+            _acidConcentrateComboBox.currentIndex = vTreatmentCreate.acidConcentrate
         }
     }