Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rfea3fc898bc7f77cc8d6daba4ebad5ea651f6ffc -rca05e940ea4a0c567acb05c4c8777dea079b0f08
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision fea3fc898bc7f77cc8d6daba4ebad5ea651f6ffc)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
@@ -17,6 +17,8 @@
         GradientStop { position: 0.8; color: Qt.darker (Colors.backgroundMain, 1.2) }
     }
 
+    function vitalsRecorded() { _vitalsButton.pulseAnimation.start() }
+
     MouseArea { id: _mouseArea
         anchors.fill    : parent
         // TODO: disable this later. this is only for diagnostic purpose.
@@ -68,27 +70,13 @@
         }
     }
 
-    Text { id: _version     // TEST : Application version should be moved into the information screen later.
+    Text { id: _timeZone    // TEST : Current timezone
         color   : Colors.textMain
         anchors {
             top         : parent.top
             left        : parent.left
+            leftMargin  : parent.width / 5
         }
-        horizontalAlignment : Text.AlignHCenter
-        verticalAlignment   : Text.AlignBottom
-
-        height  : 15
-        width   : _root.width / 4
-        text    : Qt.application.version //DEBUG: + "[" + _GuiView.platform + "]"
-        font.pixelSize: 14
-    }
-
-    Text { id: _timeZone    // TEST : Current timezone
-        color   : Colors.textMain
-        anchors {
-            top         : parent.top
-            left        : _version.right
-        }
         horizontalAlignment : Text.Alignleft
         verticalAlignment   : Text.AlignBottom
 
@@ -117,40 +105,54 @@
 
     Row { id: _headerButtonRow
         height      : parent.height
-        spacing     : 30
+        spacing     : 25
         anchors {
             verticalCenter: parent.verticalCenter
             right         : parent.right
             rightMargin   :  _headerButtonRow.spacing
         }
 
+        TreatmentCompleteButton { id  : _treatmentCompleteButton
+            extraSpace      : _headerButtonRow.spacing
+            visible         : vTDTreatmentStates.txEnd
+
+            onPressed       : _endTreatmentDialog.open()
+        }
+
+        VitalsButton { id  : _vitalsButton
+            extraSpace      : _headerButtonRow.spacing
+            visible         : vTDOpMode.preTreatment        ||
+                              vTDOpMode.inTreatment         ||
+                              vTDOpMode.postTreatment       ||
+                              vTDOpMode.validateParameters
+
+            onPressed       : _treatmentAdjustmentVitals.open()
+        }
+
         IconButton { id  : _prescriptionButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iPrescription"
             extraSpace      : _headerButtonRow.spacing
+            visible         : vTDOpMode.preTreatment        ||
+                              vTDOpMode.inTreatment         ||
+                              vTDOpMode.postTreatment
 
-            onPressed       : print("Prescription button pressed!")
+            onPressed       : _headerbarPrescription.open()
         }
 
         IconButton { id  : _wifiButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iWifi"
             extraSpace      : _headerButtonRow.spacing
-            onPressed       : _wifiDialog.openDialog(_wifiButton)
-        }
 
-        IconButton { id  : _bluetoothButton
-            iconSize        : Variables.headerIconDiameter
-            iconImageSource : "qrc:/images/iBluetooth"
-            extraSpace      : _headerButtonRow.spacing
-
-            onPressed       : print("Bluetooth button pressed!")
+            onPressed       : _headerbarWifi.openDialog(_wifiButton)
         }
 
         IconButton { id  : _cloudSyncButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iCloudSync"
             extraSpace      : _headerButtonRow.spacing
+            enabled         : false
 
             onPressed       : print("CloudSync button pressed!")
         }
@@ -160,23 +162,24 @@
             iconImageSource : "qrc:/images/iStorage"
             extraSpace      : _headerButtonRow.spacing
 
-            onPressed       : _storageDialog.openDialog(_storageButton)
+            onPressed       : _headerbarStorage.openDialog(_storageButton)
         }
 
         IconButton { id  : _settingsButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iSettings"
             extraSpace      : _headerButtonRow.spacing
 
-            onPressed       : print("Settings button pressed!")
+            onPressed       : _headerbarSettings.openDialog(_settingsButton)
         }
 
         IconButton { id  : _informationButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iInformation"
             extraSpace      : _headerButtonRow.spacing
 
-            onPressed       : print("Information button pressed!")
+            onPressed       : _headerbarInformation.openDialog(_informationButton)
         }
     }
 }
+