diff --git a/src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui b/src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui
index 7c572c1e07..75d473827e 100644
--- a/src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui
@@ -56,7 +56,7 @@
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
-         <layout class="QFormLayout" name="formLayout">
+         <layout class="QGridLayout" name="gridLayout">
           <item row="0" column="0">
            <widget class="QLabel" name="label">
             <property name="text">
@@ -64,27 +64,6 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>Vert. Feed</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>Horiz Rapid</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>Vert Rapid</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="1">
            <widget class="Gui::QuantitySpinBox" name="horizFeed">
             <property name="sizePolicy">
@@ -107,6 +86,13 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Vert. Feed</string>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="1">
            <widget class="Gui::QuantitySpinBox" name="vertFeed">
             <property name="sizePolicy">
@@ -129,6 +115,13 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="text">
+             <string>Horiz Rapid</string>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="1">
            <widget class="Gui::QuantitySpinBox" name="horizRapid">
             <property name="sizePolicy">
@@ -151,6 +144,13 @@
             </property>
            </widget>
           </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>Vert Rapid</string>
+            </property>
+           </widget>
+          </item>
           <item row="3" column="1">
            <widget class="Gui::QuantitySpinBox" name="vertRapid">
             <property name="sizePolicy">