Index: sources/gui/qml/pages/treatment/TreatmentStart.qml
===================================================================
diff -u -r8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6 -r45617764a63d5573bfb942b039f2854ed25ba15d
--- sources/gui/qml/pages/treatment/TreatmentStart.qml	(.../TreatmentStart.qml)	(revision 8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6)
+++ sources/gui/qml/pages/treatment/TreatmentStart.qml	(.../TreatmentStart.qml)	(revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -34,8 +34,8 @@
     property int rightColumnX   : 875
 
     property int row1Y          : 100
-    property int row2Y          : 320
-    property int row3Y          : 570
+    property int row2Y          : 290 // 320
+    property int row3Y          : 540 // 570
 
     property int lineLength     : 450
     property int leftLinesX     :   0
@@ -88,16 +88,24 @@
         valueEx : 0
     }
     Line                        { x: rightLinesX; y: row1LineY; length: lineLength }
-    TreatmentFluid              { id: _fluidManagementTouchArea
+    TreatmentFluid              { id: _SalineTouchArea
+        // TODO : Another component should be inherited from this for Saline
+        buttonText: qsTr("START BOLUS")
+
         x       : rightColumnX
         y       : row2Y
         width   : _flowsTouchArea.width
+        title   : qsTr("SALINE BOLUS")
     }
     Line                        { x: rightLinesX; y: row2LineY; length: lineLength; }
-    TreatmentInfusion           { id: _solutionInfusionTouchArea
+    TreatmentFluid              { id: _heparinTouchArea
+        // TODO : Another component should be inherited from this for Heparin
+        buttonText: qsTr("PAUSE DELIVERY")
+
         x       : rightColumnX
         y       : row3Y
         width   : _flowsTouchArea.width
+        title   : qsTr("HEPARIN")
     }
 
     // ---------- Center