diff --git a/src/Mod/Spreadsheet/Gui/DlgBindSheet.ui b/src/Mod/Spreadsheet/Gui/DlgBindSheet.ui
index 79eb651311..7fc32f8021 100644
--- a/src/Mod/Spreadsheet/Gui/DlgBindSheet.ui
+++ b/src/Mod/Spreadsheet/Gui/DlgBindSheet.ui
@@ -66,7 +66,14 @@ The expression must evaluates to a string of some cell address.</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1" colspan="2">
+   <item row="2" column="1" colspan="2">
+    <widget class="QComboBox" name="comboBox">
+     <property name="toolTip">
+      <string>Select which spread sheet to bind to.</string>
+     </property>
+    </widget>
+   </item>
+  <item row="3" column="1" colspan="2">
     <widget class="QCheckBox" name="checkBoxHREF">
      <property name="toolTip">
       <string>Use hidden reference not avoid creating a depdenecy with the referenced object. Use with caution!</string>
@@ -104,14 +111,7 @@ The expression must evaluates to a string of some cell address.</string>
      </item>
     </layout>
    </item>
-   <item row="2" column="1" colspan="2">
-    <widget class="QComboBox" name="comboBox">
-     <property name="toolTip">
-      <string>Select which spread sheet to bind to.</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
+   </layout>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/Mod/Spreadsheet/Gui/DlgSettings.ui b/src/Mod/Spreadsheet/Gui/DlgSettings.ui
index 4a86c3ca70..df08b1802c 100644
--- a/src/Mod/Spreadsheet/Gui/DlgSettings.ui
+++ b/src/Mod/Spreadsheet/Gui/DlgSettings.ui
@@ -26,38 +26,6 @@
       <string>Import/Export Settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="2" column="0">
-       <widget class="QLabel" name="textLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Escape Character: </string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="Gui::PrefLineEdit" name="quoteCharLineEdit">
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Character used to delimit strings, typically is single quote (') or double quote (&amp;quot;). Must be a single character.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="whatsThis">
-         <string/>
-        </property>
-        <property name="text">
-         <string>"</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ImportExportQuoteCharacter</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Spreadsheet</cstring>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0">
        <widget class="QLabel" name="textLabel">
         <property name="sizePolicy">
@@ -71,36 +39,20 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="Gui::PrefLineEdit" name="escapeCharLineEdit">
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Escape character, typically the backslash (\), used to indicate special unprintable characters, e.g. \t = tab. Must be a single character.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <item row="0" column="1">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
-        <property name="text">
-         <string>\</string>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
         </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ImportExportEscapeCharacter</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Spreadsheet</cstring>
-        </property>
-       </widget>
+       </spacer>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="textLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Quote Character: </string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
+     <item row="0" column="2">
        <widget class="Gui::PrefComboBox" name="delimiterComboBox">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Character to use as field delimiter.  Default is tab, but also commonly used are commas (,) and semicolons (;). Select from the list or enter your own in the field. Must be a single character or the words &lt;span style=" font-style:italic;"&gt;tab&lt;/span&gt;, &lt;span style=" font-style:italic;"&gt;comma&lt;/span&gt;, or &lt;span style=" font-style:italic;"&gt;semicolon&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -134,20 +86,68 @@
         </item>
        </widget>
       </item>
-      <item row="0" column="1">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+      <item row="1" column="0">
+       <widget class="QLabel" name="textLabel2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
+        <property name="text">
+         <string>Quote Character: </string>
         </property>
-       </spacer>
+       </widget>
       </item>
-     </layout>
+      <item row="1" column="2">
+       <widget class="Gui::PrefLineEdit" name="quoteCharLineEdit">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Character used to delimit strings, typically is single quote (') or double quote (&amp;quot;). Must be a single character.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="whatsThis">
+         <string/>
+        </property>
+        <property name="text">
+         <string>"</string>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>ImportExportQuoteCharacter</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Spreadsheet</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="textLabel3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Escape Character: </string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="Gui::PrefLineEdit" name="escapeCharLineEdit">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Escape character, typically the backslash (\), used to indicate special unprintable characters, e.g. \t = tab. Must be a single character.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>\</string>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>ImportExportEscapeCharacter</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Spreadsheet</cstring>
+        </property>
+       </widget>
+      </item>
+      </layout>
     </widget>
    </item>
    <item row="1" column="0">
diff --git a/src/Mod/Spreadsheet/Gui/DlgSheetConf.ui b/src/Mod/Spreadsheet/Gui/DlgSheetConf.ui
index 49601c27b2..799b9f103f 100644
--- a/src/Mod/Spreadsheet/Gui/DlgSheetConf.ui
+++ b/src/Mod/Spreadsheet/Gui/DlgSheetConf.ui
@@ -14,28 +14,6 @@
    <string>Setup Configuration Table</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Property:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <widget class="QLineEdit" name="lineEditEnd">
-     <property name="toolTip">
-      <string>Ending cell address.
-
-The first column of the range is assumed to contain a list of configuration
-names, which will be used to generate a string list and bind to the given
-property for user to dynamically switch configuration.
-
-The first row of the range will be bound to whatever row (indirectly) selected
-by that property.
-</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
@@ -58,6 +36,28 @@ by that property.
      </property>
     </widget>
    </item>
+   <item row="0" column="2">
+    <widget class="QLineEdit" name="lineEditEnd">
+     <property name="toolTip">
+      <string>Ending cell address.
+
+The first column of the range is assumed to contain a list of configuration
+names, which will be used to generate a string list and bind to the given
+property for user to dynamically switch configuration.
+
+The first row of the range will be bound to whatever row (indirectly) selected
+by that property.
+</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Property:</string>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="1" colspan="2">
     <widget class="Gui::ExpressionLineEdit" name="lineEditProp">
      <property name="toolTip">
@@ -66,13 +66,6 @@ switch the design configuration. The property will be created if not exist.</str
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="2">
-    <widget class="QLineEdit" name="lineEditGroup">
-     <property name="toolTip">
-      <string>Optional property group name.</string>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
@@ -80,6 +73,13 @@ switch the design configuration. The property will be created if not exist.</str
      </property>
     </widget>
    </item>
+   <item row="2" column="1" colspan="2">
+    <widget class="QLineEdit" name="lineEditGroup">
+     <property name="toolTip">
+      <string>Optional property group name.</string>
+     </property>
+    </widget>
+   </item>
    <item row="3" column="1" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
diff --git a/src/Mod/Spreadsheet/Gui/PropertiesDialog.ui b/src/Mod/Spreadsheet/Gui/PropertiesDialog.ui
index 4a54e5376c..a66c3c865d 100644
--- a/src/Mod/Spreadsheet/Gui/PropertiesDialog.ui
+++ b/src/Mod/Spreadsheet/Gui/PropertiesDialog.ui
@@ -14,16 +14,6 @@
    <string>Cell properties</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
@@ -44,19 +34,6 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="4">
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>240</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="0" column="1">
         <widget class="QtColorPicker" name="foregroundColor"/>
        </item>
@@ -70,6 +47,19 @@
        <item row="0" column="3">
         <widget class="QtColorPicker" name="backgroundColor"/>
        </item>
+       <item row="0" column="4">
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>240</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item row="1" column="2">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
@@ -243,7 +233,14 @@
        <string>&amp;Display unit</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
-       <item row="0" column="1">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Unit string</string>
+         </property>
+        </widget>
+       </item>
+      <item row="0" column="1">
         <widget class="QLineEdit" name="displayUnit"/>
        </item>
        <item row="1" column="1">
@@ -259,23 +256,13 @@
          </property>
         </spacer>
        </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_3">
-         <property name="text">
-          <string>Unit string</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
+       </layout>
      </widget>
      <widget class="QWidget" name="tab_5">
       <attribute name="title">
        <string>A&amp;lias</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_6">
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="alias"/>
-       </item>
        <item row="0" column="0">
         <widget class="QLabel" name="label_6">
          <property name="text">
@@ -283,6 +270,9 @@
          </property>
         </widget>
        </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="alias"/>
+       </item>
        <item row="1" column="0">
         <spacer name="verticalSpacer_5">
          <property name="orientation">
@@ -300,7 +290,17 @@
      </widget>
     </widget>
    </item>
-  </layout>
+  <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   </layout>
  </widget>
  <customwidgets>
   <customwidget>