Index: sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml
===================================================================
diff -u -re5576e4397ed640fec2a936dc5e42c773870b29a -r3c543158a4f8165fe878b59e5d09ea82e06c53f5
--- sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml	(.../TreatmentHDFComponent.qml)	(revision e5576e4397ed640fec2a936dc5e42c773870b29a)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml	(.../TreatmentHDFComponent.qml)	(revision 3c543158a4f8165fe878b59e5d09ea82e06c53f5)
@@ -21,6 +21,25 @@
 import "qrc:/pages/treatment"
 
 TreatmentSection { id: _root
+    readonly property int topTextFontSize           : 25
+    readonly property int bottomTextFontSize        : 60
+    readonly property real estimatedSubstitutionVal : 23.0    // TODO update later
+    readonly property int substitutionRate          : 125   // TODO update later
+
+    readonly property real minimum      : vTreatmentRanges.substitutionVolumeMin
+    readonly property real maximum      : vTreatmentRanges.substitutionVolumeMax
+    readonly property real resolution   : vTreatmentRanges.substitutionVolumeRes
+
+    readonly property real substitutionValue: 10.0 // TODO update later
+
+    readonly property string statusText     : qsTr("Active")
+    /*isDispensing  ? qsTr("Active")    :
+          isPaused      ? qsTr("Pause")     :
+          isCompleted   ? qsTr("Complete")  :  qsTr("Active")*/
+
+    readonly property string buttonText     : qsTr("Pause Substitution Flow")
+    property color  statusColor             : Colors.transparent
+
     color           : Colors.panelBackgroundColor
     header.color    : Colors.heparinSectionHeader
     enableDropShadow: false
@@ -45,25 +64,6 @@
         color: Colors.heparinPanelBorderColor
     }
 
-    readonly property int topTextFontSize           : 25
-    readonly property int bottomTextFontSize        : 60
-    readonly property real estimatedSubstitutionVal : 23.0    // TODO update later
-    readonly property int substitutionRate          : 125   // TODO update later
-
-    readonly property real minimum      : vTreatmentRanges.substitutionVolumeMin
-    readonly property real maximum      : vTreatmentRanges.substitutionVolumeMax
-    readonly property real resolution   : vTreatmentRanges.substitutionVolumeRes
-
-    readonly property real substitutionValue: 10.0 // TODO update later
-
-    readonly property string statusText     : qsTr("Active")
-    /*isDispensing  ? qsTr("Active")    :
-          isPaused      ? qsTr("Pause")     :
-          isCompleted   ? qsTr("Complete")  :  qsTr("Active")*/
-
-    readonly property string buttonText     : qsTr("Pause Substitution Flow")
-    property color  statusColor             : Colors.transparent
-
     signal substitutionFlowClicked()
 
     contentItem: Item { id: _content