Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r828e0b187e2fa3f75d769938bede41ef34683493 -r8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 828e0b187e2fa3f75d769938bede41ef34683493)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53)
@@ -173,9 +173,10 @@
                 onReleased  : vTreatmentCreate.heparinDispensingRate = value
                 adjustable  : _heparinDispensingRateSwitch.checked
                 inActiveZero: true
-                showAdjustButtons: _heparinDispensingRateSwitch.checked
+                enableAdjustButtons: _heparinDispensingRateSwitch.checked
 
                 //            ToDo: create a component for Switch,
+                //            ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property
                 //            This is a full implementation of a Switch
                 Switch { id: _heparinDispensingRateSwitch
                     property bool active: false
@@ -190,7 +191,7 @@
                     }
 
                     x       : width * -1.5
-                    y       : 5     // these values are set to align the switch with slider
+                    y       : Variables.createTreatmentSwitchYDisplacement    // these values are set to align the switch with slider
                     width   : 75    // these values are set to align the switch with slider
                     height  : 85    // these values are set to align the switch with slider
                     // DEBUG: background      : Rectangle { color : "white" }
@@ -244,9 +245,10 @@
                 onReleased  : vTreatmentCreate.heparinBolusVolume = value
                 adjustable  : _heparinBolusVolumeSwitch.checked
                 inActiveZero: true
-                showAdjustButtons: _heparinBolusVolumeSwitch.checked
+                enableAdjustButtons: _heparinBolusVolumeSwitch.checked
 
                 //            ToDo: create a component for this,
+                //            ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property
                 //            This is a full implementation of a CheckBox
                 Switch { id: _heparinBolusVolumeSwitch
                     property bool active: false
@@ -261,7 +263,7 @@
                     }
 
                     x       : width * -1.5
-                    y       : 5     // these values are set to align the switch with slider
+                    y       : Variables.createTreatmentSwitchYDisplacement    // these values are set to align the switch with slider
                     width   : 75    // these values are set to align the switch with slider
                     height  : 85    // these values are set to align the switch with slider
                     // DEBUG: background      : Rectangle { color : "white" }
@@ -312,7 +314,7 @@
                 onPressed   : vTreatmentCreate.heparinStopTime = value
                 onReleased  : vTreatmentCreate.heparinStopTime = value
                 enabled     : false // this switch dipends on the heparin dispencing
-                showAdjustButtons: _heparinDispensingRateSwitch.checked
+                enableAdjustButtons: _heparinDispensingRateSwitch.checked
             }
 
             SliderCreateTreatment { id: _salineBolus
@@ -415,7 +417,7 @@
                 RangeSlider { id: _arterialPressureLimits
                     objectName  : "_arterialPressureLimitsSlider"
                     // dimension
-                    height          : Variables.sliderCreateTreatmentHeight
+                    height          : Variables.createTreatmentSliderBodyHeight
                     width           : Variables.createTreatmentSliderWidth
                     diameter        : Variables.sliderCircleDiameter
                     anchors.horizontalCenter: parent.horizontalCenter
@@ -506,7 +508,7 @@
                 RangeSlider { id: _venousPressureLimits
                     objectName: "_venousPressureLimitsSlider"
                     // dimension
-                    height          : Variables.sliderCreateTreatmentHeight
+                    height          : Variables.createTreatmentSliderBodyHeight
                     width           : Variables.createTreatmentSliderWidth
                     diameter        : Variables.sliderCircleDiameter
                     anchors.horizontalCenter: parent.horizontalCenter
@@ -576,9 +578,10 @@
                 onReleased  : vTreatmentCreate.bloodPressureMeasureInterval = value
                 adjustable  : _bloodPressureIntervalSwitch.checked
                 inActiveZero: true
-                showAdjustButtons: _bloodPressureIntervalSwitch.checked
+                enableAdjustButtons: _bloodPressureIntervalSwitch.checked
 
                 //            ToDo: create a component for this,
+                //            ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property
                 //            This is a full implementation of a CheckBox
                 Switch { id: _bloodPressureIntervalSwitch
                     property bool active: false
@@ -594,7 +597,7 @@
                     }
 
                     x       : width * -1.5
-                    y       : 5     // these values are set to align the switch with slider
+                    y       : Variables.createTreatmentSwitchYDisplacement    // these values are set to align the switch with slider
                     width   : 75    // these values are set to align the switch with slider
                     height  : 85    // these values are set to align the switch with slider
                     // DEBUG: background      : Rectangle { color : "white" }