Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295
--- sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295)
@@ -31,24 +31,6 @@
     property int          bloodFlow_MeasuredFlow_Precision: 0
     property int dialysateInletFlow_MeasuredFlow_Precision: 0
 
-    property int areaWidth      : 400
-    property int areaHeightRow1 : 170
-    property int areaHeightRow2 : 225
-    property int areaHeightRow3 : 200
-
-    property int leftColumnX    :  40
-    property int rightColumnX   : Variables.applicationWidth - leftColumnX - areaWidth
-
-    property int row1Y          : 100
-    property int row2Y          : 290 // 320
-    property int row3Y          : 540 // 570
-
-    property int lineLength     : 450
-    property int leftLinesX     :   0
-    property int rightLinesX    : Variables.applicationWidth - lineLength
-    property int row1LineY      : 275
-    property int row2LineY      : 525
-
     signal backClicked()
 
     signal sectionFlowClicked()
@@ -59,20 +41,24 @@
 
     // ---------- COLUMN LEFT
     TreatmentFlows              { id: _flowsTouchArea
-        x       : leftColumnX
-        y       : row1Y
-        width   : areaWidth
-        height  : areaHeightRow1
+//        x       : Variables.screenGridLeftColumnX
+//        y       : Variables.screenGridRow1Y
+//        width   : Variables.screenGridAreaWidth
+//        height  : Variables.screenGridAreaHeightRow1
+        x                   : Variables.screenGridLeftColumnX
+        y                   : Variables.screenGridRow3Y
+        width               : Variables.screenGridAreaWidth
+        height              : Variables.screenGridAreaHeightRow3
         onClicked: {
             sectionFlowClicked()
         }
     }
-    Line                        { x: 0; y: row1LineY; length: lineLength }
+    Line                        { x: 0; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength }
     TreatmentVitals             { id: _vitalsTouchArea
-        x       : leftColumnX
-        y       : row2Y
-        width   : areaWidth
-        height  : areaHeightRow2
+        x       : Variables.screenGridLeftColumnX
+        y       : Variables.screenGridRow2Y
+        width   : Variables.screenGridAreaWidth
+        height  : Variables.screenGridAreaHeightRow2
         onClicked: {
             sectionVitalsClicked()
         }
@@ -82,7 +68,7 @@
                           + qsTr("Last Read:")
                           + " " +  vTreatmentVitals.lastRead
     }
-    Line                        { x: 0; y: row2LineY; length: lineLength }
+    Line                        { x: 0; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength }
     TreatmentPressures          { id: _pressuresTouchArea
         arterialMinimum     : Variables.arterialValueMin
         arterialMaximum     : Variables.arterialValueMax
@@ -92,10 +78,14 @@
         arterilPressure     : vTreatmentPressureOcclusion.arterialPressure
         venousPressure      : vTreatmentPressureOcclusion.venousPressure
 
-        x                   : leftColumnX
-        y                   : row3Y
-        width               : areaWidth
-        height              : areaHeightRow3
+        x       : Variables.screenGridLeftColumnX
+        y       : Variables.screenGridRow1Y
+        width   : Variables.screenGridAreaWidth
+        height  : Variables.screenGridAreaHeightRow1
+//        x                   : Variables.screenGridLeftColumnX
+//        y                   : Variables.screenGridRow3Y
+//        width               : Variables.screenGridAreaWidth
+//        height              : Variables.screenGridAreaHeightRow3
 
         onClicked: {
             sectionPressuresClicked()
@@ -104,27 +94,27 @@
 
     // ---------- COLUMN RIGHT
     TreatmentUltrafiltration    { id: _ultrafiltrationTouchArea;
-        x           : rightColumnX
-        y           : row1Y
-        width       : areaWidth
-        height      : areaHeightRow1
+        x           : Variables.screenGridRightColumnX
+        y           : Variables.screenGridRow1Y
+        width       : Variables.screenGridAreaWidth
+        height      : Variables.screenGridAreaHeightRow1
         onClicked   : {
             sectionUltrafiltrationClicked()
         }
     }
-    Line                        { x: rightLinesX; y: row1LineY; length: lineLength }
+    Line                        { x: Variables.screenGridRightLinesX; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength }
     TreatmentSaline             { id: _salineTouchArea
-        x           : rightColumnX
-        y           : row2Y
-        width       : areaWidth
-        height      : areaHeightRow2
+        x           : Variables.screenGridRightColumnX
+        y           : Variables.screenGridRow2Y
+        width       : Variables.screenGridAreaWidth
+        height      : Variables.screenGridAreaHeightRow2
     }
-    Line                        { x: rightLinesX; y: row2LineY; length: lineLength; }
+    Line                        { x: Variables.screenGridRightLinesX; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength; }
     TreatmentHeparin            { id: _heparinTouchArea
-        x           : rightColumnX
-        y           : row3Y
-        width       : areaWidth
-        height      : areaHeightRow3
+        x           : Variables.screenGridRightColumnX
+        y           : Variables.screenGridRow3Y
+        width       : Variables.screenGridAreaWidth
+        height      : Variables.screenGridAreaHeightRow3
     }
 
     // ---------- Center