Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
===================================================================
diff -u -r80b727733768477975addc967b3d6b04ed39e598 -rfd09b0ee6e41d75755e0572008d4f932b0bddf2b
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision 80b727733768477975addc967b3d6b04ed39e598)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision fd09b0ee6e41d75755e0572008d4f932b0bddf2b)
@@ -25,10 +25,12 @@
     contentItem.objectName: "TreatmentAdjustmentVitals"
     titleText           : qsTr("Vitals")
     titlePixelSize      : Fonts.fontPixelSection
-    height              : Variables.numPadHeight
-    width               : 1000
+    height              : Variables.smallDialogHeight
+    width               : Variables.smallDialogWidth
     x                   : numPad.isOpened ? Math.round((Variables.applicationWidth - width) / 2) - 200 :
                                             Math.round((Variables.applicationWidth - width) / 2)
+    y                   : Math.round((Variables.applicationHeight - height) / 2)
+
     notification.textfontSize   : 20
     notification.visible        : vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText
     notification.anchors.rightMargin: numPad.isOpened ? 10 : 0 // fix margins when numpad is open and notifiction is displayed
@@ -69,6 +71,7 @@
     }
 
     onOpened: {
+        _bphrEntry.setInitialFocus()
         notificationText = notificationTextString
         vTreatmentVitals.doTimerStop()
     }
@@ -79,7 +82,6 @@
 
     onCloseClicked: {
         numPad.hide()
-        numPad.visible = false
         vTreatmentVitals.doSkip()
     }
 
@@ -154,6 +156,7 @@
             height                  : Variables.defaultButtonHeight
             isDefault               : true
             anchors.horizontalCenter: parent.horizontalCenter
+            enabled                 : vSettings.integratedBPCuff
 
             text    {
                 text            : qsTr("Measure Vitals")