diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index f21a19dc81d50927ac5078bc41d59e291ff433a8..ebf701b98b21f8be3d588efe2bf7b325c6bfab42 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -103,6 +103,8 @@
         <file alias="QGroundControl/FactControls/FactLabel.qml">src/FactSystem/FactControls/FactLabel.qml</file>
         <file alias="QGroundControl/FactControls/FactPanel.qml">src/FactSystem/FactControls/FactPanel.qml</file>
         <file alias="QGroundControl/FactControls/FactTextField.qml">src/FactSystem/FactControls/FactTextField.qml</file>
+        <file alias="QGroundControl/FactControls/FactTextFieldGrid.qml">src/FactSystem/FactControls/FactTextFieldGrid.qml</file>
+        <file alias="QGroundControl/FactControls/FactTextFieldRow.qml">src/FactSystem/FactControls/FactTextFieldRow.qml</file>
         <file alias="QGroundControl/FactControls/qmldir">src/FactSystem/FactControls/qmldir</file>
         <file alias="QGroundControl/FlightDisplay/qmldir">src/FlightDisplay/qmldir</file>
         <file alias="QGroundControl/FlightDisplay/FlightDisplayView.qml">src/FlightDisplay/FlightDisplayView.qml</file>
diff --git a/src/FactSystem/FactControls/FactTextFieldGrid.qml b/src/FactSystem/FactControls/FactTextFieldGrid.qml
new file mode 100644
index 0000000000000000000000000000000000000000..90097c7310111fc9b31629f577359561a3a08d91
--- /dev/null
+++ b/src/FactSystem/FactControls/FactTextFieldGrid.qml
@@ -0,0 +1,27 @@
+import QtQuick          2.2
+import QtQuick.Layouts  1.2
+
+import QGroundControl.FactSystem    1.0
+import QGroundControl.Controls      1.0
+
+GridLayout {
+    property var factList   ///< List of Facts to show
+
+    rows: factList.length
+    flow: GridLayout.TopToBottom
+
+    Repeater {
+        model: parent.factList
+
+        QGCLabel { text: modelData.name + ":" }
+    }
+
+    Repeater {
+        model: parent.factList
+
+        FactTextField {
+            Layout.fillWidth:   true
+            fact:               modelData
+        }
+    }
+}
diff --git a/src/FactSystem/FactControls/FactTextFieldRow.qml b/src/FactSystem/FactControls/FactTextFieldRow.qml
new file mode 100644
index 0000000000000000000000000000000000000000..36ea7ca08edb4f71724c705912fb3e828c674f09
--- /dev/null
+++ b/src/FactSystem/FactControls/FactTextFieldRow.qml
@@ -0,0 +1,19 @@
+import QtQuick          2.2
+import QtQuick.Layouts  1.2
+
+import QGroundControl.FactSystem    1.0
+import QGroundControl.Controls      1.0
+
+RowLayout {
+    property var fact: Fact { }
+
+    QGCLabel {
+        text: fact.name + ":"
+    }
+
+    FactTextField {
+        Layout.fillWidth:   true
+        showUnits:          true
+        fact:               parent.fact
+    }
+}
diff --git a/src/FactSystem/FactControls/qmldir b/src/FactSystem/FactControls/qmldir
index a919ae3b9d4d9849caa96a300b83c57ab10a7049..6bf7d2359c1bfc007565d9bea2571d2754b128a5 100644
--- a/src/FactSystem/FactControls/qmldir
+++ b/src/FactSystem/FactControls/qmldir
@@ -1,8 +1,10 @@
 Module QGroundControl.FactControls
 
-FactBitmask     1.0 FactBitmask.qml
-FactCheckBox    1.0 FactCheckBox.qml
-FactComboBox    1.0 FactComboBox.qml
-FactLabel       1.0 FactLabel.qml
-FactPanel       1.0 FactPanel.qml
-FactTextField   1.0 FactTextField.qml
+FactBitmask         1.0 FactBitmask.qml
+FactCheckBox        1.0 FactCheckBox.qml
+FactComboBox        1.0 FactComboBox.qml
+FactLabel           1.0 FactLabel.qml
+FactPanel           1.0 FactPanel.qml
+FactTextField       1.0 FactTextField.qml
+FactTextFieldGrid   1.0 FactTextFieldGrid.qml
+FactTextFieldRow    1.0 FactTextFieldRow.qml