diff --git a/src/AutoPilotPlugins/APM/APMPowerComponent.qml b/src/AutoPilotPlugins/APM/APMPowerComponent.qml
index 6812a0e..ef3306f 100644
--- a/src/AutoPilotPlugins/APM/APMPowerComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMPowerComponent.qml
@@ -369,8 +369,14 @@ SetupPage {
 
                 QGCButton {
                     text:       qsTr("Calculate")
-                    onClicked:  showDialog(calcVoltageMultiplierDlgComponent, qsTr("Calculate Voltage Multiplier"), qgcView.showDialogDefaultWidth, StandardButton.Close)
                     visible:    _showAdvanced
+
+                    onClicked: {
+                        _calcVoltageDlgVehicleVoltage = vehicleVoltage
+                        _calcVoltageDlgBattVoltMultParam = battVoltMult
+                        showDialog(calcVoltageMultiplierDlgComponent, qsTr("Calculate Voltage Multiplier"), qgcView.showDialogDefaultWidth, StandardButton.Close)
+                    }
+
                 }
 
                 QGCLabel {
@@ -395,8 +401,13 @@ SetupPage {
 
                 QGCButton {
                     text:       qsTr("Calculate")
-                    onClicked:  showDialog(calcAmpsPerVoltDlgComponent, qsTr("Calculate Amps per Volt"), qgcView.showDialogDefaultWidth, StandardButton.Close)
                     visible:    _showAdvanced
+
+                    onClicked: {
+                        _calcAmpsPerVoltDlgVehicleCurrent = vehicleCurrent
+                        _calcAmpsPerVoltDlgBattAmpPerVoltParam = battAmpPerVolt
+                        showDialog(calcAmpsPerVoltDlgComponent, qsTr("Calculate Amps per Volt"), qgcView.showDialogDefaultWidth, StandardButton.Close)
+                    }
                 }
 
                 QGCLabel {
@@ -411,6 +422,10 @@ SetupPage {
         } // Column
     } // Component - powerSetupComponent
 
+    // Must be set prior to use of calcVoltageMultiplierDlgComponent
+    property Fact _calcVoltageDlgVehicleVoltage
+    property Fact _calcVoltageDlgBattVoltMultParam
+
     Component {
         id: calcVoltageMultiplierDlgComponent
 
@@ -444,10 +459,10 @@ SetupPage {
                         QGCTextField { id: measuredVoltage }
 
                         QGCLabel { text: qsTr("Vehicle voltage:") }
-                        QGCLabel { text: vehicleVoltage.valueString }
+                        FactLabel { fact: _calcVoltageDlgVehicleVoltage }
 
                         QGCLabel { text: qsTr("Voltage multiplier:") }
-                        FactLabel { fact: battVoltMult }
+                        FactLabel { fact: _calcVoltageDlgBattVoltMultParam }
                     }
 
                     QGCButton {
@@ -458,9 +473,9 @@ SetupPage {
                             if (measuredVoltageValue == 0 || isNaN(measuredVoltageValue)) {
                                 return
                             }
-                            var newVoltageMultiplier = (measuredVoltageValue * battVoltMult.value) / vehicleVoltage.value
+                            var newVoltageMultiplier = (measuredVoltageValue * _calcVoltageDlgBattVoltMultParam.value) / _calcVoltageDlgVehicleVoltage.value
                             if (newVoltageMultiplier > 0) {
-                                battVoltMult.value = newVoltageMultiplier
+                                _calcVoltageDlgBattVoltMultParam.value = newVoltageMultiplier
                             }
                         }
                     }
@@ -469,6 +484,10 @@ SetupPage {
         } // QGCViewDialog
     } // Component - calcVoltageMultiplierDlgComponent
 
+    // Must be set prior to use of calcAmpsPerVoltDlgComponent
+    property Fact _calcAmpsPerVoltDlgVehicleCurrent
+    property Fact _calcAmpsPerVoltDlgBattAmpPerVoltParam
+
     Component {
         id: calcAmpsPerVoltDlgComponent
 
@@ -502,10 +521,10 @@ SetupPage {
                         QGCTextField { id: measuredCurrent }
 
                         QGCLabel { text: qsTr("Vehicle current:") }
-                        QGCLabel { text: vehicleCurrent.valueString }
+                        FactLabel { fact: _calcAmpsPerVoltDlgVehicleCurrent }
 
                         QGCLabel { text: qsTr("Amps per volt:") }
-                        FactLabel { fact: battAmpPerVolt }
+                        FactLabel { fact: _calcAmpsPerVoltDlgBattAmpPerVoltParam }
                     }
 
                     QGCButton {
@@ -516,9 +535,9 @@ SetupPage {
                             if (measuredCurrentValue == 0) {
                                 return
                             }
-                            var newAmpsPerVolt = (measuredCurrentValue * battAmpPerVolt.value) / vehicleCurrent.value
+                            var newAmpsPerVolt = (measuredCurrentValue * _calcAmpsPerVoltDlgBattAmpPerVoltParam.value) / _calcAmpsPerVoltDlgVehicleCurrent.value
                             if (newAmpsPerVolt != 0) {
-                                battAmpPerVolt.value = newAmpsPerVolt
+                                _calcAmpsPerVoltDlgBattAmpPerVoltParam.value = newAmpsPerVolt
                             }
                         }
                     }
diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index 404a747..f346276 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -129,9 +129,8 @@ QGCViewDialog {
                 }
 
                 QGCButton {
-                    anchors.baseline:   valueField.baseline
-                    visible:            _allowDefaultReset
-                    text:               qsTr("Reset to default")
+                    visible:    _allowDefaultReset
+                    text:       qsTr("Reset to default")
 
                     onClicked: {
                         fact.value = fact.defaultValue
diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml
index 422a4ff..7210f16 100644
--- a/src/QmlControls/QGCTextField.qml
+++ b/src/QmlControls/QGCTextField.qml
@@ -71,36 +71,35 @@ TextField {
                 anchors.bottom:         parent.bottom
                 anchors.rightMargin:    backgroundItem.showHelp ? 0 : control.__contentHeight * 0.333
                 anchors.right:          parent.right
-                spacing:                4
+                spacing:                ScreenTools.defaultFontPixelWidth / 4
 
                 Component.onCompleted:  control._helpLayoutWidth = unitsHelpLayout.width
                 onWidthChanged:         control._helpLayoutWidth = unitsHelpLayout.width
 
                 Text {
-                    Layout.alignment:       Qt.AlignVCenter
-                    text:                   control.unitsLabel
-                    font.pointSize:         backgroundItem.showHelp ? ScreenTools.smallFontPointSize : ScreenTools.defaultFontPointSize
-                    font.family:            ScreenTools.normalFontFamily
-                    antialiasing:           true
-                    color:                  control.textColor
-                    visible:                control.showUnits
+                    Layout.alignment:   Qt.AlignVCenter
+                    text:               control.unitsLabel
+                    font.pointSize:     backgroundItem.showHelp ? ScreenTools.smallFontPointSize : ScreenTools.defaultFontPointSize
+                    font.family:        ScreenTools.normalFontFamily
+                    antialiasing:       true
+                    color:              control.textColor
+                    visible:            control.showUnits
                 }
 
                 Rectangle {
                     Layout.margins:     2
+                    Layout.leftMargin:  0
+                    Layout.rightMargin: 1
                     Layout.fillHeight:  true
-                    Layout.alignment:   Qt.AlignRight
-                    width:              height * 0.75
+                    width:              helpLabel.contentWidth * 3
                     color:              control.textColor
-                    radius:             2
                     visible:            backgroundItem.showHelp
 
                     QGCLabel {
-                        anchors.fill:           parent
-                        verticalAlignment:      Text.AlignVCenter
-                        horizontalAlignment:    Text.AlignHCenter
-                        color:                  qgcPal.textField
-                        text:                   "?"
+                        id:                 helpLabel
+                        anchors.centerIn:   parent
+                        color:              qgcPal.textField
+                        text:               qsTr("?")
                     }
                 }
             }