diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
index 56b53115fc5fa4bde7fa7cca4c543564323ddcbd..3fabc547a18722c97237e55d7ca5e8b3f606580a 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
+++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
@@ -6,47 +6,29 @@ import QGroundControl.FactSystem 1.0
 import QGroundControl.Controls 1.0
 
 /*
-    IMPORTANT NOTE: Any changes made here must also be made to SensorsComponentSummaryFixedWing.qml
+    IMPORTANT NOTE: Any changes made here must also be made to SensorsComponentSummary.qml
 */
 
 Column {
-    anchors.fill: parent
-    anchors.margins: 8
+    Fact { id: mag0IdFact;      name: "CAL_MAG0_ID" }
+    Fact { id: gyro0IdFact;     name: "CAL_GYRO0_ID" }
+    Fact { id: accel0IdFact;    name: "CAL_ACC0_ID" }
 
-    Component {
-        id: component
+    anchors.fill:       parent
+    anchors.margins:    8
 
-        Row {
-            width: parent.width
-
-            QGCLabel { id: label; text: labelText }
-            QGCLabel {
-                property Fact fact:     Fact { name: factName }
-                horizontalAlignment:    Text.AlignRight;
-                width:                  parent.width - label.contentWidth;
-                text:                   fact.value  == 0 ? "Setup required" : "Ready"
-            }
-        }
-    }
-
-    Loader {
-        property string labelText: "Compass:"
-        property string factName: "CAL_MAG0_ID"
-        width: parent.width
-        sourceComponent: component
+    VehicleSummaryRow {
+        labelText: "Compass:"
+        valueText: mag0IdFact.value  == 0 ? "Setup required" : "Ready"
     }
 
-    Loader {
-        property string labelText: "Gyro:"
-        property string factName: "CAL_GYRO0_ID"
-        width: parent.width
-        sourceComponent: component
+    VehicleSummaryRow {
+        labelText: "Gyro:"
+        valueText: gyro0IdFact.value  == 0 ? "Setup required" : "Ready"
     }
 
-    Loader {
-        property string labelText: "Accelerometer:"
-        property string factName: "CAL_ACC0_ID"
-        width: parent.width
-        sourceComponent: component
+    VehicleSummaryRow {
+        labelText: "Accelerometer:"
+        valueText: accel0IdFact.value  == 0 ? "Setup required" : "Ready"
     }
 }
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml
index 7211124ca230803c1d93c78f6c87a3dd8f6f26d0..7705086747fff718f256f4369494166726c98713 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml
+++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml
@@ -23,17 +23,17 @@ Column {
         valueText: mag0IdFact.value  == 0 ? "Setup required" : "Ready"
     }
 
-    Row {
+    VehicleSummaryRow {
         labelText: "Gyro:"
         valueText: gyro0IdFact.value  == 0 ? "Setup required" : "Ready"
     }
 
-    Row {
+    VehicleSummaryRow {
         labelText: "Accelerometer:"
         valueText: accel0IdFact.value  == 0 ? "Setup required" : "Ready"
     }
 
-    Row {
+    VehicleSummaryRow {
         labelText: "Airspeed:"
         valueText: dPressOffFact.value  == 0 ? "Setup required" : "Ready"
     }