Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r7805806e4370be4d9207872e916f478875bd4ba6
--- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision 7805806e4370be4d9207872e916f478875bd4ba6)
@@ -25,31 +25,52 @@
 /*!
  * \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
+        property int cellWidth      : (contentItem.width / 4) - (Variables.defaultMargin) + 5
+
+        spacing: Variables.defaultMargin
+        topPadding: -Variables.defaultMargin
+
+        TreatmentFlowsComponent { id: _bloodFlow
+            title: qsTr("Blood Flow")
+            height: contentItem.height // 2
+            width: _row.cellWidth
+            value: "320"//Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
+            unitText: Variables.unitTextFlowRate
         }
-        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
+            title: qsTr("Dialysate Flow")
+            height: contentItem.height // 2
+            width: _row.cellWidth
+            value: Variables.notSetVariable(vTreatmentBloodFlow.dialysateFlow_PresFlow)
+            unitText: Variables.unitTextFlowRate
         }
+
+
+        TreatmentFlowsComponent { id: _dialysateTemp
+            title: qsTr("Dialysat Temp.")
+            height: contentItem.height // 2
+            width: _row.cellWidth
+            value: Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
+            unitText: Variables.unitTextTemperature
+        }
+
+
+
+        TreatmentFlowsComponent { id: _dialysateCond
+            title: qsTr("Dialysat Cond.")
+            height: contentItem.height // 2
+            width: _row.cellWidth
+            value: Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
+            unitText: Variables.unitTextDialCond
+            showButtons: false
+        }
     }
 }