diff --git a/src/PlanView/PlanToolBar.qml b/src/PlanView/PlanToolBar.qml
index 1d480506e68a03b86951b4f9983f6514705fa22e..fb05d33cdb02cd4c0ad728b626a1d354e288ad44 100644
--- a/src/PlanView/PlanToolBar.qml
+++ b/src/PlanView/PlanToolBar.qml
@@ -138,20 +138,22 @@ Rectangle {
         visible:        false
     }
 
-    RowLayout {
-        anchors.top:            parent.top
-        anchors.bottom:         parent.bottom
-        spacing:                _margins * 2
+    GridLayout {
+        anchors.top:                parent.top
+        anchors.bottom:             parent.bottom
+        anchors.leftMargin:     _margins
+        anchors.rightMargin:    _margins
         anchors.left:           logoRow.right
-        anchors.leftMargin:     _margins * 4
         anchors.right:          uploadButton.visible ? uploadButton.left : parent.right
-        anchors.rightMargin:    _margins
+        columnSpacing:              0//_margins
+        columns:                    3
 
         GridLayout {
             anchors.verticalCenter: parent.verticalCenter
             columns:                8
             rowSpacing:             _rowSpacing
             columnSpacing:          _labelToValueSpacing
+            Layout.alignment:       Qt.AlignHCenter
 
             QGCLabel {
                 text:               qsTr("Selected Waypoint")
@@ -206,6 +208,7 @@ Rectangle {
             columns:                5
             rowSpacing:             _rowSpacing
             columnSpacing:          _labelToValueSpacing
+            Layout.alignment:       Qt.AlignHCenter
 
             QGCLabel {
                 text:               qsTr("Total Mission")
@@ -242,6 +245,7 @@ Rectangle {
             columns:                3
             rowSpacing:             _rowSpacing
             columnSpacing:          _labelToValueSpacing
+            Layout.alignment:       Qt.AlignHCenter
 
             QGCLabel {
                 text:               qsTr("Battery")