Index: sources/gui/qml/dialogs/VitalsEntry.qml
===================================================================
diff -u -r53c2c61e0a983a903aa2f0604641bf02e52e00c2 -r4f572cf1b77d6188ed9bd859f6767b0daab159b3
--- sources/gui/qml/dialogs/VitalsEntry.qml	(.../VitalsEntry.qml)	(revision 53c2c61e0a983a903aa2f0604641bf02e52e00c2)
+++ sources/gui/qml/dialogs/VitalsEntry.qml	(.../VitalsEntry.qml)	(revision 4f572cf1b77d6188ed9bd859f6767b0daab159b3)
@@ -16,19 +16,19 @@
 // Qt
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.VirtualKeyboard 2.1
 
 // Project
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
 
 /*!
- * \brief   Contains the Alert Dialog Implementation
+ * \brief   Contains the Vitals Entry Implementation
  */
-ModalDialog { id : _root
+ModalDialog { id: _root
     objectName: "VitalsEntry" // SquishQt testability
     contentItem.objectName: "VitalsEntryContent"
+    modal: false
 
     Rectangle { id: _titleBar;
         color: "transparent";
@@ -39,64 +39,55 @@
         Text { id: _titleBarText
             color: Colors.textMain
             font.pixelSize: Fonts.fontPixelTitle
-            text: qsTr("Vitals Entry")
+            text: qsTr("Blood Pressure / HR Entry")
             anchors.centerIn: _titleBar;
         }
     }
 
-    FieldInput { id: _systolic
+    DenaliTextInput { id: _systolic
         anchors {
             top: _titleBar.bottom
-            topMargin: Variables.vitalsTopMargin
-            right: parent.horizontalCenter
+            left: parent.left
+            leftMargin: Variables.vitalsLeftMargin
         }
-        textInput.height: Variables.vitalsFieldInputHeight
-        width: Variables.vitalsFieldInputWidth
-        margin: Variables.vitalsMargin
-        validator: IntValidator{ bottom: 0;  top: 500;}
-        labelText: "Blood Pressure (Systolic)"
-    }
-
-    FieldInput { id: _diastolic
-        anchors {
-            top: _systolic.bottom
-            topMargin: Variables.vitalsTopMargin
-            right: parent.horizontalCenter
+        validator: IntValidator{
+            bottom: Variables.vitalsEntryMin
+            top: Variables.vitalsEntryMax
         }
-        textInput.height: Variables.vitalsFieldInputHeight
-        width: Variables.vitalsFieldInputWidth
-        margin: Variables.vitalsMargin
-        validator: IntValidator{ bottom: 0;  top: 500;}
-        labelText: "Blood Pressure (Diastolic)"
+        labelText: qsTr("Systolic: ")
+        onPressedEnter: {
+            _diastolic.textInput.focus = true
+        }
     }
 
-    FieldInput { id: _pulse
+    DenaliTextInput { id: _diastolic
         anchors {
-            top: _diastolic.bottom
-            topMargin: Variables.vitalsTopMargin
-            right: parent.horizontalCenter
+            top: _titleBar.bottom
+            left: _systolic.right
         }
-        textInput.height: Variables.vitalsFieldInputHeight
-        width: Variables.vitalsFieldInputWidth
-        margin: Variables.vitalsMargin
-        validator: IntValidator{ bottom: 0;  top: 500;}
-        labelText: "Heart Rate (BPM)"
+        validator: IntValidator{
+            bottom: Variables.vitalsEntryMin
+            top: Variables.vitalsEntryMax
+        }
+        labelText: qsTr("Diastolic: ")
+        onPressedEnter: {
+            _pulse.textInput.focus = true
+        }
     }
 
-    InputPanel { id: _keyboard
-        width: Variables.vitalsKeyboardWidth
-        visible: false
-        z: 1
-
+    DenaliTextInput { id: _pulse
         anchors {
-            left: _titleBar.horizontalCenter
-            leftMargin: Variables.vitalsKeyboardMargin
-            top: _titleBar.verticalCenter
+            top: _titleBar.bottom
+            left: _diastolic.right
         }
-
-        onActiveChanged: {
-            visible = !visible
+        validator: IntValidator{
+            bottom: Variables.vitalsEntryMin
+            top: Variables.vitalsEntryMax
         }
+        labelText: qsTr("Heart Rate (BPM): ")
+        onPressedEnter: {
+            _keyboard.setVisible(false)
+        }
     }
 
     Row { id: _buttons
@@ -133,11 +124,4 @@
             }
         }
     }
-
-    Connections {
-        target: vVitals
-        onDidManualEntryRequest: {
-            _root.open()
-        }
-    }
 }