Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rbe918124565d9f0add371e25782804f19e0cba17 -r9048646630717f980a852df54349805ba63773e0
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision be918124565d9f0add371e25782804f19e0cba17)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 9048646630717f980a852df54349805ba63773e0)
@@ -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.
@@ -103,13 +105,23 @@
 
     Row { id: _headerButtonRow
         height      : parent.height
-        spacing     : 30
+        spacing     : 25
         anchors {
             verticalCenter: parent.verticalCenter
             right         : parent.right
             rightMargin   :  _headerButtonRow.spacing
         }
 
+        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"
@@ -125,18 +137,10 @@
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iWifi"
             extraSpace      : _headerButtonRow.spacing
+
             onPressed       : _headerbarWifi.openDialog(_wifiButton)
         }
 
-        IconButton { id  : _bluetoothButton
-            iconSize        : Variables.headerIconDiameter
-            iconImageSource : "qrc:/images/iBluetooth"
-            extraSpace      : _headerButtonRow.spacing
-            enabled         : false
-
-            onPressed       : print("Bluetooth button pressed!")
-        }
-
         IconButton { id  : _cloudSyncButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iCloudSync"