Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -rbe918124565d9f0add371e25782804f19e0cba17 -rb12853c86ef9e517667516dc3e47bca07349cedf
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision be918124565d9f0add371e25782804f19e0cba17)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision b12853c86ef9e517667516dc3e47bca07349cedf)
@@ -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
@@ -66,7 +66,6 @@
         _heparinStopTimeControl         .refresh()
         _dialysateTemperatureControl    .refresh()
         _salineBolusVolumeControl       .refresh()
-        _bpMeasurementIntervalControl   .refresh()
     }
 
     function clear () {
@@ -114,7 +113,7 @@
                 _dialyzerTypeComboBox           .isActive     &&
                 _dialysateTemperatureControl    .isActive     && _dialysateTemperature    .valid  &&
                 _salineBolusVolumeControl       .isActive     && _salineBolusVolume       .valid  &&
-                _bpMeasurementIntervalControl   .isActive     && _bpMeasurementInterval   .valid
+                _bpMeasurementIntervalControl   .isActive
     }
 
     function validate () {
@@ -142,6 +141,7 @@
     Connections {  target: _acidConcentrateAdjustment
         function onAccepted () {
             vTreatmentCreate.acidConcentrate      = _acidConcentrateComboBox.find(_acidConcentrateAdjustment.adjustment)
+            _acidConcentrateComboBox.currentIndex = vTreatmentCreate.acidConcentrate
         }
     }
 
@@ -499,6 +499,37 @@
                 }
             }
 
+            LabelUnitContainer { id: _bpMeasurementInterval
+                text        : qsTr("Vitals Interval")
+                unitText    : Variables.unitTextDuration
+                valid       : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason
+
+                contentItem : BaseComboBox { id: _bpMeasurementIntervalControl
+                    anchors.rightMargin : Variables.defaultMargin * 2
+                    anchors.leftMargin  : anchors.rightMargin
+                    anchors.topMargin   : Variables.defaultMargin / 2
+                    anchors.bottomMargin: anchors.topMargin
+                    isActive            : vTreatmentCreate.bloodPressureMeasureIntervalSet
+                    enabled             : _root.editingEnabled
+                    currentIndex        : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString())
+                    model               : vTreatmentRanges.bloodPressureMeasureInterval
+                    canOff              : true
+                    centerHorizontally  : true
+
+                    onClear             : {
+                        vTreatmentCreate.bloodPressureMeasureIntervalSet = false
+                    }
+
+                    onActivated         : {
+                        if ( ! _bpMeasurementInterval.valid ) {
+                            vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason
+                        }
+                        vTreatmentCreate.bloodPressureMeasureInterval    = vTreatmentRanges.bloodPressureMeasureInterval[_bpMeasurementIntervalControl.currentIndex]
+                        vTreatmentCreate.bloodPressureMeasureIntervalSet = true
+                    }
+                }
+            }
+
             LabelUnitContainer { id: _dialysateTemperature
                 text        : qsTr("Dialysate Temperature")
                 unitText    : Variables.unitTextTemperature
@@ -541,28 +572,6 @@
                     }
                 }
             }
-
-            LabelUnitContainer { id: _bpMeasurementInterval
-                text        : qsTr("BP Measurement Interval")
-                unitText    : Variables.unitTextDuration
-                valid       : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason
-
-                contentItem : ValueAdjuster { id: _bpMeasurementIntervalControl
-                    editable        : _root.editingEnabled
-                    minimum         : vTreatmentRanges.bloodPressureMeasureIntervalMin
-                    maximum         : vTreatmentRanges.bloodPressureMeasureIntervalMax
-                    step            : vTreatmentRanges.bloodPressureMeasureIntervalRes
-                    defaultValue    : vTreatmentRanges.bloodPressureMeasureIntervalDef
-                    value           : vTreatmentCreate.bloodPressureMeasureInterval
-                    canOff          : true
-                    isActive        : vTreatmentCreate.bloodPressureMeasureIntervalSet
-                    onDidActiveChange: function(vState) {  vTreatmentCreate.bloodPressureMeasureIntervalSet = vState }
-                    onDidChange     : function(vValue) {
-                        if ( ! _bpMeasurementInterval.valid ) { vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason }
-                        vTreatmentCreate.bloodPressureMeasureInterval = vValue
-                    }
-                }
-            }
         }
     }
 }