Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r50e38888132835a21357dfadff7a9bb1ccfdd334
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 50e38888132835a21357dfadff7a9bb1ccfdd334)
@@ -57,24 +57,81 @@
                                          || _treatmentUltrafiltrationItem       .visible
     // Components
     MainMenu            { id: _treatmentMenu
-        y               : Variables.mainMenuHeight * -1
+//        y               : Variables.mainMenuHeight * -1
         position        : MainMenu.Position.Top
         hidden          : true
-        titles          : [ qsTr("Treatment") , qsTr("Trending") , qsTr("Settings") ]
-        visibleItems    : [       true        ,       false      ,       false      ]
-        spacing         :  20
-        leftPdding      :  20
-        rightPdding     :  50
-        partitionWidth  : 100 // Todo Important : max width should be the width for all bottons
-        hasRightText    : true
-        hasLogo         : true
+        titles          : [ qsTr("Treatment") , qsTr("Trending") , qsTr("Heparin") ]
+        visibleItems    : [       true        ,       true      ,       true      ]
+        spacing         :  Variables.defaultMargin
+        leftPdding      :  Variables.headerBarDateTimeWidth + Variables.columnSpacing // 200 + 60
+        partitionWidth  : 80 * titles.length// Todo Important : max width should be the width for all bottons
+        titlePixelSize  : 32
+
         /* ----- TEST: Under the test code, for the plotting of the items -----
         onCurrentIndexChanged: {
             console.debug(currentIndex)
             if (currentIndex == 1) push(_treatmentTrending)
             if (currentIndex == 0) pop()
         }
         */
+
+        Row { id: _headerButtonRow
+            width       : 350
+            height      : parent.height
+
+            spacing     : Variables.defaultMargin
+            anchors {
+                right       : parent.right
+            }
+
+            TouchRect { id  : _prescriptionButton
+                width       : Variables.mainMenuHeight
+                height      : Variables.mainMenuHeight
+                border.color: "transparent"
+
+                Image { id  : _prescriptionImage
+                    anchors.centerIn: parent
+                    height  : Variables.mainTreatmentIconDiameter
+                    width   : Variables.mainTreatmentIconDiameter
+                    fillMode: Image.PreserveAspectFit
+                    source  : "qrc:/images/iPrescription"
+                }
+
+                onPressed: print("Prescription button pressed!")
+            }
+
+            TouchRect { id  : _settingsButton
+                width       : Variables.mainMenuHeight
+                height      : Variables.mainMenuHeight
+                border.color: "transparent"
+
+                Image { id  : _settingsImage
+                    anchors.centerIn: parent
+                    height  : Variables.mainTreatmentIconDiameter
+                    width   : Variables.mainTreatmentIconDiameter
+                    fillMode: Image.PreserveAspectFit
+                    source  : "qrc:/images/iSettings"
+                }
+
+                onPressed: print("Settings button pressed!")
+            }
+
+            TouchRect { id  : _wifiButton
+                width       : Variables.mainMenuHeight
+                height      : Variables.mainMenuHeight
+                border.color: "transparent"
+
+                Image { id  : _wifiImage
+                    anchors.centerIn: parent
+                    height  : Variables.mainTreatmentIconDiameter
+                    width   : Variables.mainTreatmentIconDiameter
+                    fillMode: Image.PreserveAspectFit
+                    source  : "qrc:/images/iWifi"
+                }
+
+                onPressed: print("Wifi button pressed!")
+            }
+        }
     }
 
     TreatmentBloodPrime         { id: _treatmentBloodPrime          }