Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
===================================================================
diff -u -r595ed1fbe8066960afd4c8fea168208e81b173d9 -r44a85c96ab55e424866ec4cca0270aa218355f82
--- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision 595ed1fbe8066960afd4c8fea168208e81b173d9)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision 44a85c96ab55e424866ec4cca0270aa218355f82)
@@ -1,20 +1,20 @@
 /*!
- *
+ * 
  * 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    TreatmentFlows.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 TreatmentFlows.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
 
@@ -26,22 +26,34 @@
  * \brief   Treatment Screen Flows section
  */
 TouchArea { id: _root
+    property string unit                    : qsTr("mL/min")
+    property alias      bloodFlowSetPoint   :          _bloodFlow.label
+    property alias  dialysateFlowSetPoint   : _dialysateInletFlow.label
 
-    x: leftColumnX
-    y: row1Y
-    title: qsTr("FLOWS")
-    components: [
+    x       : 0
+    y       : 0
+    title   : qsTr("FLOWS")
+    width   : 370
+
+    Row {
+        spacing: 40
+        anchors.top: _root.top
+        anchors.topMargin: 40
         TextRect { id: _bloodFlow
-            title: qsTr("Blood")
-            label: vTreatmentBloodFlow.bloodFlow_MeasuredFlow
-            extra: qsTr("mL")  // unit
+            title : qsTr("Blood")
+            label : vTreatmentBloodFlow.bloodFlow_FlowSetPoint
+            extra : unit
             labelFont.weight: Font.ExtraLight
-        } ,
+            width : 180
+            height: 200
+        }
         TextRect { id: _dialysateInletFlow
             title: qsTr("Dialysate")
-            label: vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow
-            extra: qsTr("mL")  // unit
+            label: vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint
+            extra: unit
             labelFont.weight: Font.ExtraLight
+            width: 180
+            height: 200
         }
-    ]
+    }
 }