Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -21,35 +21,78 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/pages/treatment"
 
 /*!
  * \brief   Treatment Screen Flows section
  */
-TouchArea { id: _root
-    x       : 0
-    y       : 0
-    title   : qsTr("FLOWS")
-    width   : 370
+TreatmentSection { id: _root
+    property bool editEnabled   : header.editEnabled
 
-    Row {
-        spacing: 40
-        anchors.top: _root.top
-        anchors.topMargin: 40
-        TextRect { id: _bloodFlow
-            title : qsTr("Blood")
-            label : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
-            extra : Variables.unitTextFlowRate
-            labelFont.weight: Font.ExtraLight
-            width : 180
-            height: 200
+    header.title    : qsTr("Treatment Parameters")
+    header.showLock : true
+
+    contentItem: Row { id   : _row
+        objectName          : "row"
+
+        property int cellWidth      : (contentItem.width / 4) - (Variables.defaultMargin) + 5
+        property int cellHeight     : contentItem.height - 10
+
+        spacing: Variables.defaultMargin
+        topPadding: -Variables.defaultMargin
+
+        TreatmentFlowsComponent { id: _bloodFlow
+            objectName      : "bloodFlowComponent"
+            title           : qsTr("Blood Flow")
+            height          : _row.cellHeight
+            width           : _row.cellWidth
+            value           : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
+            unitText        : Variables.unitTextFlowRate
+            buttonsEnabled  : editEnabled
+
+            onIncrement     : print(" increment blood flow")
+            onDecrement     : print(" decrement blood flow")
         }
-        TextRect { id: _dialysateInletFlow
-            title: qsTr("Dialysate")
-            label: Variables.notSetVariable(vTreatmentDialysateFlow.dialysateFlow_PresFlow)
-            extra: Variables.unitTextFlowRate
-            labelFont.weight: Font.ExtraLight
-            width: 180
-            height: 200
+
+        TreatmentFlowsComponent { id: _dialysateFlow
+            objectName      : "dialysateFlowComponent"
+            title           : qsTr("Dialysate Flow")
+            height          : _row.cellHeight
+            width           : _row.cellWidth
+            value           : Variables.notSetVariable(vTreatmentBloodFlow.dialysateFlow_PresFlow)
+            unitText        : Variables.unitTextFlowRate
+            buttonsEnabled  : editEnabled   // TODO
+            extraText       : "OFF"         // TODO
+
+            onIncrement     : print(" increment dial flow")
+            onDecrement     : print(" decrement dial flow")
         }
+
+        TreatmentFlowsComponent { id: _dialysateTemp
+            objectName      : "dialysateTempComponent"
+            title           : qsTr("Dialysate Temp.")
+            height          : _row.cellHeight
+            width           : _row.cellWidth
+            value           : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
+            unitText        : Variables.unitTextTemperature
+            buttonsEnabled  : editEnabled   // TODO
+
+            onIncrement     : print(" increment dial temp")
+            onDecrement     : print(" decrement dial temp")
+        }
+
+        TreatmentFlowsComponent { id: _dialysateCond
+            objectName      : "dialysateCondComponent"
+            title           : qsTr("Dialysate Cond.")
+            height          : _row.cellHeight
+            width           : _row.cellWidth
+            value           : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
+            unitText        : Variables.unitTextDialCond
+            showButtons     : false
+            dropShadowEnabled : false
+
+            onIncrement     : print(" increment dial cond")
+            onDecrement     : print(" decrement dial cond")
+        }
     }
 }