Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r13ac42cf8bdc5038dedd3302ba79dc387e5704b4 -r21e68ccf5594b0ca3e0a8c7986e405260d273899
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 13ac42cf8bdc5038dedd3302ba79dc387e5704b4)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 21e68ccf5594b0ca3e0a8c7986e405260d273899)
@@ -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
@@ -88,18 +88,19 @@
     readonly property int sliderCircleDiameter                  : 25
 
     readonly property int pressuresProgressbarWidth             : 725
-    
+
     readonly property int gridSelectionButtonHeight             : 100
     readonly property int gridSelectionButtonWidth              : 375
 
+    readonly property int informationTableHeight                : 800
+    readonly property int informationTableWidth                 : applicationWidth - 50
+    readonly property int informationTableMargin                : 45
+    readonly property int informationSubTableHeight             : 50
+    readonly property int informationSubTableWidth              : 500
+    readonly property int informationTableEntryMargin           : 20
+    readonly property int informationTableHeaderHeight          : 130
+
     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
@@ -115,21 +116,27 @@
 
     readonly property int settingsArrowHeight                   : 30
     readonly property int settingsArrowWidth                    : 24
+    readonly property int settingsButtonWidth                   : 300
+    readonly property int settingsButtonHeight                  : 85
+    readonly property int settingsMargin                        : 75
+    readonly property int settingsSpacing                       : 20
+    readonly property int settingsInputWidth                    : 225
+    readonly property int settingsNotificationMargin            : 10
 
     readonly property int settingsBLEListViewWidth              : 360
     readonly property int settingsBLEItemRightMargin            : 20
-    readonly property int settingsBLEButtonWidth                : 300
-    readonly property int settingsBLEButtonHeight               : 85
-    readonly property int settingsBLEMargin                     : 75
+    readonly property int settingsBLEButtonWidth                : settingsButtonWidth
+    readonly property int settingsBLEButtonHeight               : settingsButtonHeight
+    readonly property int settingsBLEMargin                     : settingsMargin
     readonly property int settingsBLEListViewMargin             : 25
     readonly property int settingsOptionWidth                   : 550
     readonly property int settingsOptionHeight                  : 50
 
-    readonly property int settingsWIFIButtonWidth               : settingsBLEButtonWidth
-    readonly property int settingsWIFIButtonHeight              : settingsBLEButtonHeight
-    readonly property int settingsWIFIMargin                    : settingsBLEMargin
-    readonly property int settingsWIFIInputWidth                : 225
-    readonly property int settingsWIFISpacing                   : 20
+    readonly property int settingsWIFIButtonWidth               : settingsButtonWidth
+    readonly property int settingsWIFIButtonHeight              : settingsButtonHeight
+    readonly property int settingsWIFIMargin                    : settingsMargin
+    readonly property int settingsWIFIInputWidth                : settingsInputWidth
+    readonly property int settingsWIFISpacing                   : settingsSpacing
     readonly property int settingsWIFINetworkHeight             : 85
     readonly property int settingsWIFINetworkWidth              : 375
     readonly property int settingsWIFINetworksWidth             : settingsWIFINetworkWidth + 50
@@ -144,6 +151,10 @@
     readonly property int textInputHeight                       : 50
     readonly property int textInputLineWidth                    : 100
 
+    readonly property int settingsDateTimeSetMargin             : settingsMargin
+    readonly property int settingsDateTimeSetSpacing            : settingsSpacing
+    readonly property int settingsDateTimeSetInputWidth         : settingsInputWidth
+
     // ---------- < PRS > Related Section ----------
     // Min/Max
     readonly property int     bloodFlowMin          : 100