diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
index 50faacd4c..8137ea266 100644
--- a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
@@ -331,7 +331,7 @@ bool TaskDatumParameters::updatePreview()
         }
     }
     QString splmLabelText = attached ? tr("Extra placement:") : tr("Extra placement (inactive - not attached):");
-    ui->label_superplacement->setText(splmLabelText);
+    ui->groupBox_superplacement->setTitle(splmLabelText);
     return attached;
 }
 
diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.ui b/src/Mod/PartDesign/Gui/TaskDatumParameters.ui
index 8c234ac5b..f956ab917 100644
--- a/src/Mod/PartDesign/Gui/TaskDatumParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>272</width>
-    <height>583</height>
+    <width>271</width>
+    <height>604</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -110,18 +110,21 @@
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="label_superplacement">
+    <widget class="QGroupBox" name="groupBox_superplacement">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Mirror of superPlacement property. Extra placement is expressed in local space of object being attached.</string>
      </property>
-     <property name="text">
+     <property name="title">
       <string>Extra placement:</string>
      </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <item>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="1" column="0">
       <widget class="QLabel" name="labelOffset">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -130,25 +133,14 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>X</string>
+         <string>X:</string>
+       </property>
+        <property name="buddy">
+         <cstring>labelOffset</cstring>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="Gui::PrefQuantitySpinBox" name="superplacementX" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_9">
-     <item>
+      <item row="2" column="0">
       <widget class="QLabel" name="labelOffset2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -157,11 +149,11 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Y</string>
+         <string>Y:</string>
        </property>
       </widget>
      </item>
-     <item>
+      <item row="2" column="1">
       <widget class="Gui::PrefQuantitySpinBox" name="superplacementY" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -169,13 +161,15 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>5</height>
+         </size>
+        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_8">
-     <item>
+      <item row="3" column="0">
       <widget class="QLabel" name="labelOffset3">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -184,11 +178,11 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Z</string>
+         <string>Z:</string>
        </property>
       </widget>
      </item>
-     <item>
+      <item row="3" column="1">
       <widget class="Gui::PrefQuantitySpinBox" name="superplacementZ" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -196,13 +190,15 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>5</height>
+         </size>
+        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2_yaw">
-     <item>
+      <item row="4" column="0">
       <widget class="QLabel" name="labelYaw">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -211,38 +207,25 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Yaw</string>
+         <string>Yaw:</string>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="Gui::QuantitySpinBox" name="superplacementYaw" native="true">
+      <item row="5" column="0">
+       <widget class="QLabel" name="labelPitch">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="unit" stdset="0">
-        <string notr="true">deg</string>
-       </property>
-       <property name="minimum" stdset="0">
-        <double>-360.000000000000000</double>
-       </property>
-       <property name="maximum" stdset="0">
-        <double>360.000000000000000</double>
-       </property>
-       <property name="value" stdset="0">
-        <double>0.000000000000000</double>
+        <property name="text">
+         <string>Pitch:</string>
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2_pitch">
-     <item>
-      <widget class="QLabel" name="labelPitch">
+      <item row="6" column="0">
+       <widget class="QLabel" name="labelRoll">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -250,12 +233,28 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Pitch</string>
+         <string>Roll:</string>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="Gui::QuantitySpinBox" name="superplacementPitch" native="true">
+      <item row="1" column="1">
+       <widget class="Gui::PrefQuantitySpinBox" name="superplacementX" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>5</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="Gui::QuantitySpinBox" name="superplacementYaw">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -265,36 +264,41 @@
        <property name="unit" stdset="0">
         <string notr="true">deg</string>
        </property>
-       <property name="minimum" stdset="0">
+        <property name="minimum">
         <double>-360.000000000000000</double>
        </property>
-       <property name="maximum" stdset="0">
+        <property name="maximum">
         <double>360.000000000000000</double>
        </property>
-       <property name="value" stdset="0">
+        <property name="value">
         <double>0.000000000000000</double>
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2_roll">
-     <item>
-      <widget class="QLabel" name="labelRoll">
+      <item row="5" column="1">
+       <widget class="Gui::QuantitySpinBox" name="superplacementPitch">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text">
-        <string>Roll</string>
+        <property name="unit" stdset="0">
+         <string notr="true">deg</string>
+        </property>
+        <property name="minimum">
+         <double>-360.000000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>360.000000000000000</double>
+        </property>
+        <property name="value">
+         <double>0.000000000000000</double>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="Gui::QuantitySpinBox" name="superplacementRoll" native="true">
+      <item row="6" column="1">
+       <widget class="Gui::QuantitySpinBox" name="superplacementRoll">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -304,18 +308,19 @@
        <property name="unit" stdset="0">
         <string notr="true">deg</string>
        </property>
-       <property name="minimum" stdset="0">
+        <property name="minimum">
         <double>-360.000000000000000</double>
        </property>
-       <property name="maximum" stdset="0">
+        <property name="maximum">
         <double>360.000000000000000</double>
        </property>
-       <property name="value" stdset="0">
+        <property name="value">
         <double>0.000000000000000</double>
        </property>
       </widget>
      </item>
     </layout>
+    </widget>
    </item>
    <item>
     <widget class="QCheckBox" name="checkBoxFlip">
@@ -330,7 +335,7 @@
   <customwidget>
    <class>Gui::QuantitySpinBox</class>
    <extends>QWidget</extends>
-   <header location="global">Gui/QuantitySpinBox.h</header>
+   <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
   <customwidget>
    <class>Gui::PrefQuantitySpinBox</class>
@@ -338,6 +343,35 @@
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>buttonRef1</tabstop>
+  <tabstop>lineRef1</tabstop>
+  <tabstop>buttonRef2</tabstop>
+  <tabstop>lineRef2</tabstop>
+  <tabstop>buttonRef3</tabstop>
+  <tabstop>lineRef3</tabstop>
+  <tabstop>buttonRef4</tabstop>
+  <tabstop>lineRef4</tabstop>
+  <tabstop>listOfModes</tabstop>
+  <tabstop>checkBoxFlip</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
+ <designerdata>
+  <property name="gridDeltaX">
+   <number>10</number>
+  </property>
+  <property name="gridDeltaY">
+   <number>10</number>
+  </property>
+  <property name="gridSnapX">
+   <bool>true</bool>
+  </property>
+  <property name="gridSnapY">
+   <bool>true</bool>
+  </property>
+  <property name="gridVisible">
+   <bool>true</bool>
+  </property>
+ </designerdata>
 </ui>