diff --git a/python/plugins/fTools/tools/frmSpatialJoin.ui b/python/plugins/fTools/tools/frmSpatialJoin.ui
index cd80f70f7f68..4db7c2acab62 100644
--- a/python/plugins/fTools/tools/frmSpatialJoin.ui
+++ b/python/plugins/fTools/tools/frmSpatialJoin.ui
@@ -19,8 +19,8 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="3">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_3">
@@ -34,7 +34,7 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0" colspan="3">
+   <item>
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label">
@@ -48,28 +48,24 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0" colspan="3">
+   <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Attribute Summary</string>
      </property>
      <layout class="QGridLayout">
-      <item row="0" column="0" colspan="7">
-       <widget class="QRadioButton" name="rdoFirst">
-        <property name="text">
-         <string>Take attributes of first located feature</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
+      <item row="2" column="6">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="7">
-       <widget class="QRadioButton" name="rdoSummary">
-        <property name="text">
-         <string>Take summary of intersecting features</string>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
         </property>
-       </widget>
+       </spacer>
       </item>
       <item row="2" column="0">
        <spacer>
@@ -97,23 +93,20 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QCheckBox" name="chkMin">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
+      <item row="1" column="0" colspan="7">
+       <widget class="QRadioButton" name="rdoSummary">
         <property name="text">
-         <string>Min</string>
+         <string>Take summary of intersecting features</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="3">
-       <widget class="QCheckBox" name="chkMax">
+      <item row="2" column="2">
+       <widget class="QCheckBox" name="chkMin">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
-         <string>Max</string>
+         <string>Min</string>
         </property>
        </widget>
       </item>
@@ -127,19 +120,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="6">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item row="2" column="5">
        <widget class="QCheckBox" name="chkMedian">
         <property name="enabled">
@@ -150,10 +130,30 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="3">
+       <widget class="QCheckBox" name="chkMax">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>Max</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="7">
+       <widget class="QRadioButton" name="rdoFirst">
+        <property name="text">
+         <string>Take attributes of first located feature</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="3">
+   <item>
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_2">
@@ -182,7 +182,7 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0" colspan="3">
+   <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Output table</string>
@@ -208,41 +208,32 @@
      </layout>
     </widget>
    </item>
-   <item row="5" column="0" rowspan="3" colspan="3">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>359</width>
-       <height>16</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="7" column="1">
-    <widget class="QProgressBar" name="progressBar">
-     <property name="value">
-      <number>24</number>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="textVisible">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="2" rowspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QProgressBar" name="progressBar">
+       <property name="value">
+        <number>24</number>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+       <property name="textVisible">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
diff --git a/python/plugins/fTools/tools/frmVectorSplit.ui b/python/plugins/fTools/tools/frmVectorSplit.ui
index 6510c9a37ed8..f87a8b316b54 100644
--- a/python/plugins/fTools/tools/frmVectorSplit.ui
+++ b/python/plugins/fTools/tools/frmVectorSplit.ui
@@ -1,105 +1,106 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>Dialog</class>
- <widget class="QDialog" name="Dialog" >
-  <property name="windowModality" >
+ <widget class="QDialog" name="Dialog">
+  <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
-  <property name="geometry" >
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>374</width>
-    <height>306</height>
+    <width>378</width>
+    <height>239</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Vector Split</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" colspan="2" >
-    <widget class="QLabel" name="label_3" >
-     <property name="text" >
-      <string>Input vector layer</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QComboBox" name="inShape" />
-   </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QLabel" name="label_4" >
-     <property name="text" >
-      <string>Unique ID field</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2" >
-    <widget class="QComboBox" name="inField" />
-   </item>
-   <item row="4" column="0" colspan="2" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
-      <string>Output folder</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="5" column="0" colspan="2">
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QLineEdit" name="outShape" >
-       <property name="readOnly" >
+      <widget class="QLineEdit" name="outShape">
+       <property name="readOnly">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="toolOut" >
-       <property name="text" >
+      <widget class="QToolButton" name="toolOut">
+       <property name="text">
         <string>Browse</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="6" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Unique ID field</string>
      </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QComboBox" name="inField"/>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QComboBox" name="inShape"/>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Output folder</string>
      </property>
-    </spacer>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Input vector layer</string>
+     </property>
+    </widget>
    </item>
-   <item row="7" column="0" >
-    <widget class="QProgressBar" name="progressBar" >
-     <property name="value" >
+   <item row="7" column="0">
+    <widget class="QProgressBar" name="progressBar">
+     <property name="value">
       <number>0</number>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignHCenter</set>
      </property>
-     <property name="textVisible" >
+     <property name="textVisible">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="7" column="1" >
-    <widget class="QDialogButtonBox" name="buttonBox_2" >
-     <property name="orientation" >
+   <item row="7" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox_2">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
+   <item row="6" column="0">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
@@ -110,11 +111,11 @@
    <receiver>Dialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>124</x>
      <y>355</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>215</x>
      <y>290</y>
     </hint>
@@ -126,11 +127,11 @@
    <receiver>Dialog</receiver>
    <slot>close()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>50</x>
      <y>350</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>132</x>
      <y>239</y>
     </hint>