diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.ui b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.ui
index 23734d367f..e6c8516d95 100644
--- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.ui
+++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.ui
@@ -212,7 +212,27 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="2">
+      <item row="2" column="0">
+       <widget class="Gui::PrefCheckBox" name="uvdir">
+        <property name="text">
+         <string>User-defined u/v directions</string>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>User-Defined UVDir</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/ReverseEngineering/BSplineFit</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QPushButton" name="makePlacement">
+        <property name="text">
+         <string>Create placement</string>
+        </property>
+       </widget>
+      </item>
+     <item row="3" column="0" colspan="2">
        <widget class="QGroupBox" name="groupBoxSmooth">
         <property name="title">
          <string>Smoothing</string>
@@ -340,27 +360,7 @@
         </layout>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="Gui::PrefCheckBox" name="uvdir">
-        <property name="text">
-         <string>User-defined u/v directions</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>User-Defined UVDir</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/ReverseEngineering/BSplineFit</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="makePlacement">
-        <property name="text">
-         <string>Create placement</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+      </layout>
     </widget>
    </item>
   </layout>
diff --git a/src/Mod/ReverseEngineering/Gui/Segmentation.ui b/src/Mod/ReverseEngineering/Gui/Segmentation.ui
index 4c9926b48b..9b98a70a49 100644
--- a/src/Mod/ReverseEngineering/Gui/Segmentation.ui
+++ b/src/Mod/ReverseEngineering/Gui/Segmentation.ui
@@ -14,20 +14,6 @@
    <string>Mesh segmentation</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="1">
-    <widget class="QSpinBox" name="smoothSteps">
-     <property name="value">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QCheckBox" name="createCompound">
-     <property name="text">
-      <string>Create compound</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QCheckBox" name="checkBoxSmooth">
      <property name="text">
@@ -38,6 +24,13 @@
      </property>
     </widget>
    </item>
+   <item row="0" column="1">
+    <widget class="QSpinBox" name="smoothSteps">
+     <property name="value">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBoxPln">
      <property name="title">
@@ -108,7 +101,14 @@
      </property>
     </widget>
    </item>
-  </layout>
+  <item row="3" column="0" colspan="2">
+    <widget class="QCheckBox" name="createCompound">
+     <property name="text">
+      <string>Create compound</string>
+     </property>
+    </widget>
+   </item>
+   </layout>
  </widget>
  <resources/>
  <connections/>
diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.ui b/src/Mod/ReverseEngineering/Gui/SegmentationManual.ui
index 24fa1f58d1..437fb2f599 100644
--- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.ui
+++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.ui
@@ -35,13 +35,6 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <item row="2" column="0">
-       <widget class="QPushButton" name="selectComponents">
-        <property name="text">
-         <string>Components</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0">
        <widget class="QPushButton" name="selectRegion">
         <property name="text">
@@ -49,17 +42,23 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="QCheckBox" name="cbSelectComp">
-        <property name="text">
-         <string>Select whole component</string>
+      <item row="0" column="1" colspan="2">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
-       </widget>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>161</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
       </item>
-      <item row="3" column="0">
-       <widget class="QPushButton" name="selectTriangle">
+      <item row="1" column="0">
+       <widget class="QPushButton" name="selectAll">
         <property name="text">
-         <string>Pick triangle</string>
+         <string>All</string>
         </property>
        </widget>
       </item>
@@ -76,6 +75,13 @@
         </property>
        </spacer>
       </item>
+      <item row="2" column="0">
+       <widget class="QPushButton" name="selectComponents">
+        <property name="text">
+         <string>Components</string>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="1">
        <widget class="QLabel" name="label">
         <property name="text">
@@ -83,28 +89,22 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QPushButton" name="selectAll">
-        <property name="text">
-         <string>All</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="2">
        <widget class="QSpinBox" name="spSelectComp"/>
       </item>
-      <item row="0" column="1" colspan="2">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+      <item row="3" column="0">
+       <widget class="QPushButton" name="selectTriangle">
+        <property name="text">
+         <string>Pick triangle</string>
         </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>161</width>
-          <height>20</height>
-         </size>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2">
+       <widget class="QCheckBox" name="cbSelectComp">
+        <property name="text">
+         <string>Select whole component</string>
         </property>
-       </spacer>
+       </widget>
       </item>
       <item row="4" column="0">
        <widget class="QPushButton" name="deselectAll">
@@ -122,7 +122,14 @@
       <string>Plane</string>
      </property>
      <layout class="QGridLayout" name="gridLayoutPln">
-      <item row="1" column="0">
+      <item row="0" column="1">
+       <widget class="QPushButton" name="planeDetect">
+        <property name="text">
+         <string>Detect</string>
+        </property>
+       </widget>
+      </item>
+     <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Tolerance</string>
@@ -159,14 +166,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="planeDetect">
-        <property name="text">
-         <string>Detect</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+      </layout>
     </widget>
    </item>
    <item row="2" column="0">
@@ -175,7 +175,14 @@
       <string>Cylinder</string>
      </property>
      <layout class="QGridLayout" name="gridLayoutCyl">
-      <item row="1" column="0">
+      <item row="0" column="1">
+       <widget class="QPushButton" name="cylinderDetect">
+        <property name="text">
+         <string>Detect</string>
+        </property>
+       </widget>
+      </item>
+     <item row="1" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Tolerance</string>
@@ -212,14 +219,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="cylinderDetect">
-        <property name="text">
-         <string>Detect</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+      </layout>
     </widget>
    </item>
    <item row="3" column="0">
@@ -228,7 +228,14 @@
       <string>Sphere</string>
      </property>
      <layout class="QGridLayout" name="gridLayoutSph">
-      <item row="1" column="0">
+      <item row="0" column="1">
+       <widget class="QPushButton" name="sphereDetect">
+        <property name="text">
+         <string>Detect</string>
+        </property>
+       </widget>
+      </item>
+     <item row="1" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Tolerance</string>
@@ -265,14 +272,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="sphereDetect">
-        <property name="text">
-         <string>Detect</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+      </layout>
     </widget>
    </item>
    <item row="4" column="0">