Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
===================================================================
diff -u -r9e57e4c990afab0996def98521d4f9fee83f96d8 -r44a85c96ab55e424866ec4cca0270aa218355f82
--- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision 9e57e4c990afab0996def98521d4f9fee83f96d8)
+++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision 44a85c96ab55e424866ec4cca0270aa218355f82)
@@ -1,23 +1,22 @@
 /*!
- *
+ * 
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
- * \copyright                                                       \n
- *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,  \n
- *          IN PART OR IN WHOLE,                                    \n
- *          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n
- *
- * \file    TreatmentVitals.qml
- * \date    2020/01/27
- * \author  Behrouz NematiPour
- *
+ * \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 TreatmentVitals.qml
+ * \author (last) Behrouz NematiPour
+ * \date (last) 21-May-2020
+ * \author (original) Behrouz NematiPour
+ * \date (original) 27-Jan-2020
+ * 
  */
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
-import Gui.Actions 0.1;
 
 //  Qml imports
 import "qrc:/globals"
@@ -26,24 +25,26 @@
 /*!
  * \brief   Treatment Screen Vitals section
  */
-TouchArea { id: _vitalsTouchArea
+TouchArea { id: _root
     property alias textRectBloodPressure : _bloodPressure
     property alias textRectHeartBeat     : _heartBeat
 
-    x: leftColumnX
-    y: row2Y
+    x: 0
+    y: 0
     isTouchable: false
-    orientation: TouchArea.Orientation.Vertical
     title: qsTr("VITALS")
-    components: [
+
+    Column {
+        anchors.top: _root.top
+        anchors.topMargin: 60
         TextRect { id: _bloodPressure
             labelHeight: 60
             labelFont.pixelSize: Fonts.fontPixelVitals
             labelFont.weight: Font.ExtraLight
             labelAutoSize: true
             label: "120/80"         // value
             extra: qsTr("mmHg")     // unit
-        } ,
+        }
         TextRect { id: _heartBeat
             labelHeight: 40
             labelFont.pixelSize: Fonts.fontPixelVitals
@@ -52,5 +53,5 @@
             label: "130"        // value
             extra: qsTr("BPM")  // unit
         }
-    ]
+    }
 }