Index: sources/gui/qml/components/TextRect.qml
===================================================================
diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r7edbf109108511ddf6066758bdb7aa29f9d8fad3
--- sources/gui/qml/components/TextRect.qml	(.../TextRect.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
+++ sources/gui/qml/components/TextRect.qml	(.../TextRect.qml)	(revision 7edbf109108511ddf6066758bdb7aa29f9d8fad3)
@@ -44,6 +44,8 @@
     width : _column.width
     height: _column.height
 
+    clip: false
+
     Column { id: _column
         width : Math.max(_titleText.width  , _row.width )
         height:          _titleText.height + _row.height + spacing
Index: sources/gui/qml/components/TouchArea.qml
===================================================================
diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r7edbf109108511ddf6066758bdb7aa29f9d8fad3
--- sources/gui/qml/components/TouchArea.qml	(.../TouchArea.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
+++ sources/gui/qml/components/TouchArea.qml	(.../TouchArea.qml)	(revision 7edbf109108511ddf6066758bdb7aa29f9d8fad3)
@@ -47,7 +47,7 @@
 
     width : _column.width + arrowSpacing
     height: _column.height
-    clip: true
+    clip  : false
 
     Column { id: _column
         width   : Math.max(_titleText.width  , _grid.width)
Index: sources/gui/qml/components/TouchRect.qml
===================================================================
diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r7edbf109108511ddf6066758bdb7aa29f9d8fad3
--- sources/gui/qml/components/TouchRect.qml	(.../TouchRect.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
+++ sources/gui/qml/components/TouchRect.qml	(.../TouchRect.qml)	(revision 7edbf109108511ddf6066758bdb7aa29f9d8fad3)
@@ -88,6 +88,7 @@
         onClicked   : {
             if ( disabled ) { return }
             animate(true)
+            _root.clicked()
         }
     }
 
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
===================================================================
diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r7edbf109108511ddf6066758bdb7aa29f9d8fad3
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml	(.../TreatmentAdjustmentFlow.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml	(.../TreatmentAdjustmentFlow.qml)	(revision 7edbf109108511ddf6066758bdb7aa29f9d8fad3)
@@ -37,7 +37,7 @@
     property alias  dialysateFlowRateMaximum : _dialysateFlowSlider.maximum
     property alias  dialysateFlowRateStep    : _dialysateFlowSlider.step
 
-    property string unit        : qsTr("mL")
+    property string unit        : qsTr("mL/min")
     property int    textWidth   : 200
 
     Column { id : _flowsColumn
Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
===================================================================
diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r7edbf109108511ddf6066758bdb7aa29f9d8fad3
--- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision 7edbf109108511ddf6066758bdb7aa29f9d8fad3)
@@ -25,21 +25,26 @@
  * \brief   Treatment Screen Flows section
  */
 TouchArea { id: _root
+    property string unit : qsTr("mL/min")
     x       : 0
     y       : 0
     title   : qsTr("FLOWS")
+    width   : 370
+    componentsHSpacing: 15
     components: [
         TextRect { id: _bloodFlow
             title: qsTr("Blood")
             label: vTreatmentBloodFlow.bloodFlow_MeasuredFlow
-            extra: qsTr("mL")  // unit
+            extra: unit
             labelFont.weight: Font.ExtraLight
+            width: 180
         } ,
         TextRect { id: _dialysateInletFlow
             title: qsTr("Dialysate")
             label: vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow
-            extra: qsTr("mL")  // unit
+            extra: unit
             labelFont.weight: Font.ExtraLight
+            width: 180
         }
     ]
 }
Index: sources/main.h
===================================================================
diff -u -rb166776048ef9001ff2cb4b69df81a5dff40849a -r7edbf109108511ddf6066758bdb7aa29f9d8fad3
--- sources/main.h	(.../main.h)	(revision b166776048ef9001ff2cb4b69df81a5dff40849a)
+++ sources/main.h	(.../main.h)	(revision 7edbf109108511ddf6066758bdb7aa29f9d8fad3)
@@ -68,16 +68,20 @@
           if (   vALWAYSEMIT                                    \
               || ! init                                         \
               || _##vVARIABLE != v##vVARIABLE               ) { \
+                 qDebug() << "#" << #vVARIABLE << v##vVARIABLE; \
                  init = true;                                   \
                  _##vVARIABLE  = v##vVARIABLE;                  \
                  emit vVARIABLE##Changed( _##vVARIABLE );       \
           }                                                     \
         }
 //--------------------------------------------------------------------------------//
 //--------------------------------------------------------------------------------//
+#define ACTION_METHOD_BRIDGE_CONNECTION(vMETHOD, vSOURCE, vTYPE)        \
+    connect(&vSOURCE, SIGNAL(did##vMETHOD(const    vTYPE &)),           \
+            this    ,   SLOT( on##vMETHOD(const    vTYPE &)));
+//--------------------------------------------------------------------------------//
 #define ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, vTYPE)                \
-    connect(&vSOURCE, SIGNAL(didActionReceive(const    vTYPE &)),       \
-            this    ,   SLOT( onActionReceive(const    vTYPE &)));
+    ACTION_METHOD_BRIDGE_CONNECTION(ActionReceive, vSOURCE, vTYPE)
 //--------------------------------------------------------------------------------//
 #define ACTION_RECEIVE_PRIVATE_SLOT(vTYPE)                              \
 private Q_SLOTS:                                                        \
Index: sources/model/mtreatmentflows.h
===================================================================
diff -u -r3bdf58e8bee7d76eb19c1116738ff1e2c534ccc7 -r7edbf109108511ddf6066758bdb7aa29f9d8fad3
--- sources/model/mtreatmentflows.h	(.../mtreatmentflows.h)	(revision 3bdf58e8bee7d76eb19c1116738ff1e2c534ccc7)
+++ sources/model/mtreatmentflows.h	(.../mtreatmentflows.h)	(revision 7edbf109108511ddf6066758bdb7aa29f9d8fad3)
@@ -51,6 +51,9 @@
     const Data &data() const ;
 };
 
+/*!
+ * \brief The Blood Flow Data class
+ */
 class MBloodFlow : public MFlow {
 public:
     struct Data {
@@ -66,6 +69,9 @@
     Data  data() const;
 };
 
+/*!
+ * \brief The Dialysate Flow Data class
+ */
 class MDialysateFlow : public MFlow {
 public:
     struct Data {