Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r533c771015857845302bcbc58b411ecef2d6ec79 -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 533c771015857845302bcbc58b411ecef2d6ec79)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b)
@@ -1,16 +1,16 @@
 /*!
- *
+ * 
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- *
+ * 
  * \file Variables.qml
  * \author (last) Peter Lucia
  * \date (last) 06-Oct-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 09-Oct-2019
- *
+ * 
  */
 
 // Qt
@@ -23,88 +23,102 @@
  * which is going to be used in the project.
  */
 QtObject {
-    readonly property int applicationWidth          : 1280
-    readonly property int applicationHeight         : 800
-    readonly property int buttonSpacing             : 150
-    readonly property int dialogIconHeight          : 50
-    readonly property int dialogIconWidth           : 50
-    readonly property int dialogIconHorizontalOffset: 25
-    readonly property int headerHeight          : 100
+    readonly property int applicationWidth                      : 1280
+    readonly property int applicationHeight                     : 800
+    readonly property int buttonSpacing                         : 150
+    readonly property int dialogIconHeight                      : 50
+    readonly property int dialogIconWidth                       : 50
+    readonly property int dialogIconHorizontalOffset            : 25
+    readonly property int headerHeight                          : 100
 
-    readonly property int mainMenuHeight        : 70
+    readonly property int mainMenuHeight                        : 70
 
-    readonly property int logoWidth             : 50
-    readonly property int logoHeight            : 50
+    readonly property int logoWidth                             : 50
+    readonly property int logoHeight                            : 50
 
-    readonly property int largeArrowWidth       : 24
-    readonly property int largeArrowHeight      : 32
+    readonly property int largeArrowWidth                       : 24
+    readonly property int largeArrowHeight                      : 32
 
-    readonly property int arrowWidth            : 12
-    readonly property int arrowHeight           : 16
+    readonly property int arrowWidth                            : 12
+    readonly property int arrowHeight                           : 16
 
-    readonly property int borderWidth           : 2
+    readonly property int borderWidth                           : 2
 
-    readonly property int touchRectWidth        : 512   //K:D //425
-    readonly property int touchRectHeight       : 85    //K:D //70
-    readonly property int touchRectRadius       : 45
+    readonly property int touchRectWidth                        : 512   //K:D //425
+    readonly property int touchRectHeight                       : 85    //K:D //70
+    readonly property int touchRectRadius                       : 45
 
     readonly property int titleBottomPadding    : 25
 
-    readonly property int columnSpacing         : 25    //K:D //20
+    readonly property int columnSpacing                         : 25    //K:D //20
 
-    readonly property int dialogMargin          : mainMenuHeight * 2
-    readonly property int dialogWidth           : applicationWidth  - dialogMargin
-    readonly property int dialogHeight          : applicationHeight - dialogMargin
-    readonly property int dialogRadius          : 10
+    readonly property int dialogMargin                          : mainMenuHeight * 2
+    readonly property int dialogWidth                           : applicationWidth  - dialogMargin
+    readonly property int dialogHeight                          : applicationHeight - dialogMargin
+    readonly property int dialogRadius                          : 10
 
-    readonly property int rangeRectMargin       : 1
-    readonly property int rangeRectRadius       : 2
-    readonly property int rangeRectTextMargin   : 7
-    readonly property int rangeMarkerHeight     : 60
-    readonly property int rangeMarkerHeightMidle: 40
-    readonly property int rangeMarkerHeightShort: 20
-    readonly property int rangeMarkerWidth      : 2
+    readonly property int rangeRectMargin                       : 1
+    readonly property int rangeRectRadius                       : 2
+    readonly property int rangeRectTextMargin                   : 7
+    readonly property int rangeMarkerHeight                     : 60
+    readonly property int rangeMarkerHeightMidle                : 40
+    readonly property int rangeMarkerHeightShort                : 20
+    readonly property int rangeMarkerWidth                      : 2
 
-    readonly property int progressbarHeight     : 30
-    readonly property int progressbarHandler    : 35
+    readonly property int progressbarHeight                     : 30
+    readonly property int progressbarHandler                    : 35
 
-    readonly property int progressbarFluidHeight:  5
-    readonly property int progressbarSmall      :  5
-    readonly property int progressbarSmallWidth :  600
-    readonly property int progressbarRectHeight :  50
-    readonly property int progressbarRectWidth  :  620
+    readonly property int progressbarFluidHeight                : 5
+    readonly property int progressbarSmall                      : 5
+    readonly property int progressbarSmallWidth                 : 600
+    readonly property int progressbarRectHeight                 : 50
+    readonly property int progressbarRectWidth                  : 620
 
-    readonly property int sliderTextMargin      : 20
-    readonly property int treatmentSpacing      : 60
+    readonly property int sliderTextMargin                      : 20
+    readonly property int treatmentSpacing                      : 60
 
-    readonly property int notificationHeight    : 50
-    readonly property int notificationIconSize  : 36
+    readonly property int notificationHeight                    : 50
+    readonly property int notificationIconSize                  : 36
 
-    readonly property int backIconDiameter      : 17
+    readonly property int backIconDiameter                      : 17
 
-    readonly property int pauseIconDiameter     : 60
-    readonly property int topBarMenuHeight      : 100
-    readonly property int sliderCircleDiameter  : 25
+    readonly property int pauseIconDiameter                     : 60
+    readonly property int topBarMenuHeight                      : 100
+    readonly property int sliderCircleDiameter                  : 25
 
-    readonly property int pressuresProgressbarWidth     : 725
+    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           : 40
+    readonly property int createTreatmentSliderHeight           : 50
+    readonly property int createTreatmentSliderWidth            : 750
+
     readonly property int ultrafiltrationProgressbarWidth       : 880
     readonly property int ultrafiltrationAdjustmtenOptionWidth  : 520
     readonly property int ultrafiltrationAdjustmtenOptionHeight : 275
 
-    readonly property int silenceIconMargin         : 20
-    readonly property int notificationBarIconMargin : 10
-    readonly property int notificationBarIconHeight : 30
-    readonly property int notificationBarIconWidth  : 30
+    readonly property int silenceIconMargin                     : 20
+    readonly property int notificationBarIconMargin             : 10
+    readonly property int notificationBarIconHeight             : 30
+    readonly property int notificationBarIconWidth              : 30
 
-    readonly property int settingsOptionWidth       : 550
-    readonly property int settingsOptionHeight      : 50
+    readonly property int settingsOptionWidth                   : 550
+    readonly property int settingsOptionHeight                  : 50
 
     // ---------- < PRS > Related Section ----------
     // Min/Max
     readonly property int     bloodFlowMin          : 100
     readonly property int     bloodFlowMax          : 500
-
     // Resolutions
     readonly property int     bloodFlowResolution   : 25
     readonly property int dialysateFlowResolution   : 50
@@ -147,14 +161,14 @@
 
     // Units
     // - Ultrafiltration
-    readonly property string unitTextUltrafiltrationVolume  : qsTr("(L)")
-    readonly property string unitTextUltrafiltrationRate    : qsTr("mL/min")
-    readonly property string unitTextTreatmentDuration      : qsTr("min")
+    readonly property string unitTextUltrafiltrationVolume      : qsTr("(L)")
+    readonly property string unitTextUltrafiltrationRate        : qsTr("mL/min")
+    readonly property string unitTextTreatmentDuration          : qsTr("min")
     // - Flows
-    readonly property string unitTextFlowRate               : qsTr("mL/min")
+    readonly property string unitTextFlowRate                   : qsTr("mL/min")
     // - Vitals
-    readonly property string unitTextBloodPressure          : qsTr("mmHg")
-    readonly property string unitTextHeartBeat              : qsTr("BPM" )
+    readonly property string unitTextBloodPressure              : qsTr("mmHg")
+    readonly property string unitTextHeartBeat                  : qsTr("BPM" )
     // - Fluid
     readonly property string unitTextFluid                  : qsTr("mL")
     readonly property string unitTextSaline                 : unitTextFluid