diff --git a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
index 7cbb7b6..9cff1c6 100644
--- a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
+++ b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
@@ -50,7 +50,7 @@ FactPanel {
 
         VehicleSummaryRow {
             labelText: qsTr("Battery capacity:")
-            valueText: battCapacity.valueString
+            valueText: battCapacity.valueString + " " + battCapacity.units
         }
     }
 }
diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
index 2ef5c96..9e2a597 100644
--- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
+++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
@@ -120,22 +120,22 @@ FactPanel {
 
         VehicleSummaryRow {
             labelText: qsTr("RTL min alt:")
-            valueText: _rtlAltFact.value == 0 ? qsTr("current") : _rtlAltFact.valueString
+            valueText: _rtlAltFact.value == 0 ? qsTr("current") : _rtlAltFact.valueString + " " + _rtlAltFact.units
         }
 
         VehicleSummaryRow {
             labelText: qsTr("RTL loiter time:")
-            valueText: _rtlLoitTimeFact.valueString
+            valueText: _rtlLoitTimeFact.valueString + " " + _rtlLoitTimeFact.units
         }
 
         VehicleSummaryRow {
             labelText: qsTr("RTL final alt:")
-            valueText: _rtlAltFinalFact.value == 0 ? qsTr("Land") : _rtlAltFinalFact.valueString
+            valueText: _rtlAltFinalFact.value == 0 ? qsTr("Land") : _rtlAltFinalFact.valueString + " " + _rtlAltFinalFact.units
         }
 
         VehicleSummaryRow {
             labelText: qsTr("Descent speed:")
-            valueText: _landSpeedFact.valueString
+            valueText: _landSpeedFact.valueString + " " + _landSpeedFact.units
         }
     }
 }
diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
index d0063be..ccb832b 100644
--- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
+++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
@@ -32,17 +32,17 @@ FactPanel {
 
         VehicleSummaryRow {
             labelText: qsTr("Voltage failsafe:")
-            valueText:  _failsafeBattVoltage.value == 0 ? qsTr("Disabled") : _failsafeBattVoltage.valueString
+            valueText:  _failsafeBattVoltage.value == 0 ? qsTr("Disabled") : _failsafeBattVoltage.valueString + " " + _failsafeBattVoltage.units
         }
 
         VehicleSummaryRow {
             labelText: qsTr("mAh failsafe:")
-            valueText:  _failsafeBattMah.value == 0 ? qsTr("Disabled") : _failsafeBattMah.valueString
+            valueText:  _failsafeBattMah.value == 0 ? qsTr("Disabled") : _failsafeBattMah.valueString + " " + _failsafeBattMah.units
         }
 
         VehicleSummaryRow {
             labelText: qsTr("RTL min alt:")
-            valueText: _rtlAltFact.value < 0 ? qsTr("current") : _rtlAltFact.valueString
+            valueText: _rtlAltFact.value < 0 ? qsTr("current") : _rtlAltFact.valueString + " " + _rtlAltFact.units
         }
     }
 }
diff --git a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
index a3bd324..5159108 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
+++ b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
@@ -50,12 +50,12 @@ FactPanel {
 
         VehicleSummaryRow {
             labelText: qsTr("Battery Full:")
-            valueText: batVChargedFact ? batVChargedFact.valueString : ""
+            valueText: batVChargedFact ? batVChargedFact.valueString + " " + batVChargedFact.units : ""
         }
 
         VehicleSummaryRow {
             labelText: qsTr("Battery Empty:")
-            valueText: batVEmptyFact ? batVEmptyFact.valueString : ""
+            valueText: batVEmptyFact ? batVEmptyFact.valueString + " " + batVEmptyFact.units : ""
         }
 
         VehicleSummaryRow {
diff --git a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
index 6b61ad2..9b6a2b1 100644
--- a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
+++ b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
@@ -27,17 +27,17 @@ FactPanel {
 
         VehicleSummaryRow {
             labelText: qsTr("RTL min alt:")
-            valueText: returnAltFact ? returnAltFact.valueString : ""
+            valueText: returnAltFact ? returnAltFact.valueString + " " + returnAltFact.units : ""
         }
 
         VehicleSummaryRow {
             labelText: qsTr("RTL home alt:")
-            valueText: descendAltFact ? descendAltFact.valueString : ""
+            valueText: descendAltFact ? descendAltFact.valueString + " " + descendAltFact.units : ""
         }
 
         VehicleSummaryRow {
-            labelText: qsTr("RC loss RTL (seconds):")
-            valueText: commRCLossFact ? commRCLossFact.valueString : ""
+            labelText: qsTr("RC loss RTL:")
+            valueText: commRCLossFact ? commRCLossFact.valueString + " " + commRCLossFact.units : ""
         }
 
         VehicleSummaryRow {