Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r6e18f1d24b8cc3d84d26f46f36f73deb34e54371 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 6e18f1d24b8cc3d84d26f46f36f73deb34e54371)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -9,6 +9,8 @@
     property alias headerMenuIndex          : _headerMenu.index
     property alias titleText                : _title.text
     property alias loggedUser               : _loggedInUser.text
+    readonly property int currentScreen     : _headerMenu.currentScreen
+    property alias statusColor              : _headerMenu.statusColor
 
     width   : Variables.applicationWidth
     height  : Variables.headerHeight
@@ -115,13 +117,12 @@
             bottomMargin: hidden || disable ? height * -1 : 0
         }
         height  : parent.height
-        width   : parent.width / 3
+        width   : parent.width / 2 // gives the width of the headerbar menu
         hidden          : true
         titlePixelSize  : 32
         backgroundColor : Colors.transparent
         highlightHeight : 15
         isMainTreatment : true
-
         onHiddenChanged: { if (hidden) { index = 0 } }
     }
 
@@ -134,6 +135,13 @@
             rightMargin   :  _headerButtonRow.spacing
         }
 
+        TreatmentCompleteButton { id  : _treatmentCompleteButton
+            extraSpace      : _headerButtonRow.spacing
+            visible         : vTDTreatmentStates.txEnd
+
+            onPressed       : _endTreatmentDialog.open()
+        }
+
         VitalsButton { id  : _vitalsButton
             extraSpace      : _headerButtonRow.spacing
             visible         : vTDOpMode.preTreatment        ||