Index: sources/gui/qml/compounds/BPHREntry.qml
===================================================================
diff -u -rb07595ece768d4093d78ca1ef068a993ff4f70a3 -r596aa427447d3757005ae759c64c52ebb26b9503
--- sources/gui/qml/compounds/BPHREntry.qml	(.../BPHREntry.qml)	(revision b07595ece768d4093d78ca1ef068a993ff4f70a3)
+++ sources/gui/qml/compounds/BPHREntry.qml	(.../BPHREntry.qml)	(revision 596aa427447d3757005ae759c64c52ebb26b9503)
@@ -31,8 +31,10 @@
     property alias diastolic        : _bloodPressureDiastolic.text
     property alias heartRate        : _heartRate.text
 
-    readonly property int controlWidth   : width - Variables.defaultMargin * 4
+ 
+    readonly property int controlWidth   : width - ( contentPadding * 2 )
     readonly property int controlHeight  : 75
+    readonly property int contentPadding : Variables.defaultMargin * 7
 
     readonly property bool isValid  :
         _bloodPressureSystolic  .isValid
@@ -43,15 +45,14 @@
 
     width       : _container.width
     height      : _container.height
-    anchors.fill: parent
 
     QtObject { id: _private
         property bool isBloodPressureCompareValid : (parseInt(_bloodPressureDiastolic.text) <= parseInt(_bloodPressureSystolic.text))
     }
 
     Column { id: _container
         spacing         : 15
-        leftPadding     : Variables.defaultMargin * 2
+        leftPadding     : _root.contentPadding
         anchors.fill    : parent
 
         LabelUnitContainer { id: _bpContainer
@@ -117,6 +118,7 @@
                 textInput.font.pixelSize    : Fonts.fontPixelValueControl
                 line.visible                : false
                 validator                   : IntValidator { bottom: vTreatmentVitals.heartRateMin;  top : vTreatmentVitals.heartRateMax }
+                nextInput                   : _bloodPressureSystolic
                 useQtNumPad                 : false
                 showPlaceHolderText         : true