Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -rf7d7e8b10c7626f3c6b8450876721a452ebd730f -rda2dbdbd92d099e44d11bbfb2b794d5ee19a0f0a
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision f7d7e8b10c7626f3c6b8450876721a452ebd730f)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision da2dbdbd92d099e44d11bbfb2b794d5ee19a0f0a)
@@ -114,27 +114,11 @@
     readonly property int arrowIconDiameter                     : 35
     readonly property int muteIconDiameter                      : 38
     readonly property int headerIconDiameter                    : 40
-    readonly property int topBarMenuHeight                      : 80 //// ----- @LEAHIZED
+    readonly property int topBarMenuHeight                      : 100 //// ----- @LEAHIZED
     readonly property int sliderCircleDiameter                  : 30
 
     readonly property int pressuresProgressbarWidth             : 725
 
-    readonly property int gridSelectionButtonHeight             : 100
-    readonly property int gridSelectionButtonWidth              : 375
-
-    readonly property int createTreatmentFlickableDeceleration  : 4500
-    readonly property int createTreatmentTableHeight            : 800
-    readonly property int createTreatmentTableWidth             : applicationWidth - 50
-    readonly property int createTreatmentMargin                 : 45
-    readonly property int createTreatmentHeaderHeight           : 130
-    readonly property int createTreatmentTableMargin            : 20
-    readonly property int createTreatmentSubTableHeight         : 50
-    readonly property int createTreatmentSubTableWidth          : 500
-    readonly property int createTreatmentSliderMargin           : sliderDefaultBodyHeight
-    readonly property int createTreatmentSliderHeight           : 65
-    readonly property int createTreatmentSliderWidth            : 750
-    readonly property int createTreatmentSwitchYDisplacement    : 15
-
     readonly property int treatmentFlowsComponentWidth          : 150
     readonly property int treatmentPressureTitleWidth           : 125
     readonly property int treatmentPressureValueWidth           : 140
@@ -235,6 +219,20 @@
     // Dialysate Conductivity
     readonly property int dialysateCondPrecision    : 1
 
+    // Potassium
+    readonly property int  potassiumPrecision       : 1
+    readonly property int  potassiumMin             : 0
+    readonly property int  potassiumMax             : 4
+    readonly property int  potassiumResolution      : 1
+    readonly property int  potassiumDefault         : 2
+
+    // Calcium
+    readonly property int   calciumPrecision        : 2
+    readonly property real  calciumMin              : 0.0
+    readonly property real  calciumMax              : 3.5
+    readonly property real  calciumResolution       : 0.25
+    readonly property real  calciumDefault          : 2.5
+
     function sizeConverted(vSize, vSizePowers, vRound = 2) {
         return (  vSize
                 / vSizePowers   // convert from byte to Giga byte
@@ -259,12 +257,16 @@
     readonly property var regExp_PatientID: /[A-Za-z0-9_\-\.]{1,64}/
 
 
+    readonly property string emptyEntry     : "-- --"
+
     readonly property string preTreatmentStepLabelCreate            : qsTr("CREATE"   )
     readonly property string preTreatmentStepLabelConfirm           : qsTr("CONFIRM"  )
     readonly property string preTreatmentStepLabelPriming           : qsTr("PRIME"    )
     readonly property string preTreatmentStepLabelUltrafiltration   : qsTr("BEGIN"    )
 
     // Units
+    readonly property string unitTextPotassium              : qsTr("K")
+    readonly property string unitTextCalcium                : qsTr("Ca")
     // - Ultrafiltration
     readonly property string unitTextUltrafiltrationRate    : unitTextFlowRate
     readonly property string unitTextUltrafiltrationVolume  : unitTextVolume