diff --git a/tools/mapserver_export/qgsmapserverexportbase.ui b/tools/mapserver_export/qgsmapserverexportbase.ui
index 3fb256d2b24..8c33672aef5 100644
--- a/tools/mapserver_export/qgsmapserverexportbase.ui
+++ b/tools/mapserver_export/qgsmapserverexportbase.ui
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>481</width>
-    <height>447</height>
+    <width>485</width>
+    <height>479</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -18,423 +18,407 @@
   <property name="sizeGripEnabled" >
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>10</number>
+  <widget class="QWidget" name="" />
+  <widget class="QWidget" name="" />
+  <widget class="QCheckBox" name="chkExpLayersOnly" >
+   <property name="geometry" >
+    <rect>
+     <x>117</x>
+     <y>73</y>
+     <width>359</width>
+     <height>21</height>
+    </rect>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="toolTip" >
+    <string>If checked, only the layer information will be processed</string>
    </property>
-   <item row="4" column="0" >
-    <widget class="Q3GroupBox" name="grpWeb" >
-     <property name="title" >
-      <string>Web Interface Definition</string>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>10</number>
+   <property name="text" >
+    <string>Export LAYER information only</string>
+   </property>
+  </widget>
+  <widget class="Q3GroupBox" name="grpMap" >
+   <property name="geometry" >
+    <rect>
+     <x>9</x>
+     <y>100</y>
+     <width>467</width>
+     <height>176</height>
+    </rect>
+   </property>
+   <property name="title" >
+    <string>Map</string>
+   </property>
+   <layout class="QGridLayout" >
+    <property name="margin" >
+     <number>-1</number>
+    </property>
+    <property name="spacing" >
+     <number>5</number>
+    </property>
+    <item row="3" column="2" >
+     <widget class="QLabel" name="textLabel6_2" >
+      <property name="text" >
+       <string>MaxScale</string>
       </property>
-      <property name="spacing" >
-       <number>6</number>
+     </widget>
+    </item>
+    <item row="0" column="1" colspan="3" >
+     <widget class="QLineEdit" name="txtMapName" >
+      <property name="toolTip" >
+       <string>&lt;html>&lt;head>&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; />&lt;/head>&lt;body style=&quot; white-space: pre-wrap; font-family:Sans Serif; font-weight:400; font-style:normal; text-decoration:none;&quot;>&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>Prefix attached to map, scalebar and legend GIF filenames created using this MapFile&lt;/p>&lt;/body>&lt;/html></string>
       </property>
-      <item row="2" column="0" >
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="textLabel5_3" >
-          <property name="text" >
-           <string>Footer</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="txtWebFooter" />
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnChooseFooterFile" >
-          <property name="text" >
-           <string>...</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="0" column="0" >
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="textLabel5_2" >
-          <property name="text" >
-           <string>Template</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="txtWebTemplate" >
-          <property name="toolTip" >
-           <string>&lt;html>&lt;head>&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; />&lt;/head>&lt;body style=&quot; white-space: pre-wrap; font-family:Sans Serif; font-weight:400; font-style:normal; text-decoration:none;&quot;>&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>Path to the template file&lt;/p>&lt;/body>&lt;/html></string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnChooseTemplateFile" >
-          <property name="text" >
-           <string>...</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="1" column="0" >
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="textLabel5" >
-          <property name="text" >
-           <string>Header</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="txtWebHeader" />
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnChooseHeaderFile" >
-          <property name="text" >
-           <string>...</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0" >
-    <widget class="Q3GroupBox" name="grpMap" >
-     <property name="title" >
-      <string>Map</string>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>10</number>
+     </widget>
+    </item>
+    <item row="1" column="3" >
+     <widget class="QLineEdit" name="txtMapHeight" />
+    </item>
+    <item row="1" column="2" >
+     <widget class="QLabel" name="textLabel2_2" >
+      <property name="text" >
+       <string>Height</string>
       </property>
-      <property name="spacing" >
-       <number>6</number>
+     </widget>
+    </item>
+    <item row="1" column="1" >
+     <widget class="QLineEdit" name="txtMapWidth" />
+    </item>
+    <item row="1" column="0" >
+     <widget class="QLabel" name="textLabel2" >
+      <property name="text" >
+       <string>Width</string>
       </property>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="textLabel1" >
-        <property name="toolTip" >
-         <string/>
-        </property>
-        <property name="text" >
-         <string>Name</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="5" >
-       <widget class="QLabel" name="textLabel2_2" >
-        <property name="text" >
-         <string>Height</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QComboBox" name="cmbMapUnits" >
-        <item>
-         <property name="text" >
-          <string>dd</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>feet</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>meters</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>miles</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>inches</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>kilometers</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="textLabel3" >
-        <property name="text" >
-         <string>Units</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" colspan="2" >
-       <widget class="QLabel" name="textLabel4" >
-        <property name="text" >
-         <string>Image type</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4" colspan="2" >
-       <widget class="QComboBox" name="cmbMapImageType" >
-        <item>
-         <property name="text" >
-          <string>gif</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>gtiff</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>jpeg</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>png</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>swf</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>userdefined</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>wbmp</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="0" column="1" colspan="2" >
-       <widget class="QLineEdit" name="txtMapName" >
-        <property name="toolTip" >
-         <string>&lt;html>&lt;head>&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; />&lt;/head>&lt;body style=&quot; white-space: pre-wrap; font-family:Sans Serif; font-weight:400; font-style:normal; text-decoration:none;&quot;>&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>Prefix attached to map, scalebar and legend GIF filenames created using this MapFile&lt;/p>&lt;/body>&lt;/html></string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="4" >
-       <widget class="QLineEdit" name="txtMapWidth" />
-      </item>
-      <item row="0" column="6" >
-       <widget class="QLineEdit" name="txtMapHeight" />
-      </item>
-      <item row="0" column="3" >
-       <widget class="QLabel" name="textLabel2" >
-        <property name="text" >
-         <string>Width</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="6" >
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="textLabel6" >
-          <property name="text" >
-           <string>MinScale</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="txtMinScale" />
-        </item>
-        <item>
-         <widget class="QLabel" name="textLabel6_2" >
-          <property name="text" >
-           <string>MaxScale</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="txtMaxScale" />
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="5" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="buttonHelp" >
+     </widget>
+    </item>
+    <item row="3" column="3" >
+     <widget class="QLineEdit" name="txtMaxScale" />
+    </item>
+    <item row="2" column="3" >
+     <widget class="QComboBox" name="cmbMapImageType" >
+      <item>
        <property name="text" >
-        <string>&amp;Help</string>
+        <string>gif</string>
        </property>
-       <property name="shortcut" >
-        <string>F1</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonOk" >
+      </item>
+      <item>
        <property name="text" >
-        <string>&amp;OK</string>
+        <string>gtiff</string>
        </property>
-       <property name="shortcut" >
-        <string/>
-       </property>
-       <property name="autoDefault" >
-        <bool>true</bool>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonCancel" >
+      </item>
+      <item>
        <property name="text" >
-        <string>&amp;Cancel</string>
+        <string>jpeg</string>
        </property>
-       <property name="shortcut" >
-        <string/>
-       </property>
-       <property name="autoDefault" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QCheckBox" name="chkExpLayersOnly" >
-     <property name="toolTip" >
-      <string>If checked, only the layer information will be processed</string>
-     </property>
-     <property name="text" >
-      <string>Export LAYER information only</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="textLabel7_2" >
+      </item>
+      <item>
        <property name="text" >
-        <string>QGIS Project File</string>
+        <string>png</string>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="txtQgisFilePath" >
-       <property name="toolTip" >
-        <string>QGIS project file to export to MapServer map format</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnChooseProjectFile" >
+      </item>
+      <item>
        <property name="text" >
-        <string>...</string>
+        <string>swf</string>
        </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="textLabel7" >
+      </item>
+      <item>
        <property name="text" >
-        <string>Map file</string>
+        <string>userdefined</string>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="txtMapFilePath" >
-       <property name="toolTip" >
-        <string>Name for the map file to be created from the QGIS project file</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnChooseFile" >
+      </item>
+      <item>
        <property name="text" >
-        <string>...</string>
+        <string>wbmp</string>
        </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
+      </item>
+     </widget>
+    </item>
+    <item row="2" column="2" >
+     <widget class="QLabel" name="textLabel4" >
+      <property name="text" >
+       <string>Image type</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1" >
+     <widget class="QComboBox" name="cmbMapUnits" >
+      <item>
+       <property name="text" >
+        <string>dd</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>feet</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>meters</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>miles</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>inches</string>
+       </property>
+      </item>
+      <item>
+       <property name="text" >
+        <string>kilometers</string>
+       </property>
+      </item>
+     </widget>
+    </item>
+    <item row="2" column="0" >
+     <widget class="QLabel" name="textLabel3" >
+      <property name="text" >
+       <string>Units</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="1" >
+     <widget class="QLineEdit" name="txtMinScale" />
+    </item>
+    <item row="3" column="0" >
+     <widget class="QLabel" name="textLabel6" >
+      <property name="text" >
+       <string>MinScale</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0" >
+     <widget class="QLabel" name="textLabel1" >
+      <property name="toolTip" >
+       <string/>
+      </property>
+      <property name="text" >
+       <string>Name</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+   <widget class="QWidget" name="" />
+  </widget>
+  <widget class="QLineEdit" name="txtMapFilePath" >
+   <property name="geometry" >
+    <rect>
+     <x>117</x>
+     <y>9</y>
+     <width>268</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Name for the map file to be created from the QGIS project file</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="btnChooseProjectFile" >
+   <property name="geometry" >
+    <rect>
+     <x>391</x>
+     <y>41</y>
+     <width>85</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>...</string>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="txtQgisFilePath" >
+   <property name="geometry" >
+    <rect>
+     <x>117</x>
+     <y>41</y>
+     <width>268</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>QGIS project file to export to MapServer map format</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="textLabel7_2" >
+   <property name="geometry" >
+    <rect>
+     <x>9</x>
+     <y>41</y>
+     <width>102</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>QGIS Project File</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="btnChooseFile" >
+   <property name="geometry" >
+    <rect>
+     <x>391</x>
+     <y>9</y>
+     <width>85</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>...</string>
+   </property>
+  </widget>
+  <widget class="QWidget" name="" >
+   <layout class="QHBoxLayout" >
+    <property name="margin" >
+     <number>0</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item>
+     <widget class="QPushButton" name="buttonHelp" >
+      <property name="text" >
+       <string>&amp;Help</string>
+      </property>
+      <property name="shortcut" >
+       <string>F1</string>
+      </property>
+      <property name="autoDefault" >
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <spacer>
+      <property name="orientation" >
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeType" >
+       <enum>QSizePolicy::Expanding</enum>
+      </property>
+      <property name="sizeHint" >
+       <size>
+        <width>20</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item>
+     <widget class="QPushButton" name="buttonOk" >
+      <property name="text" >
+       <string>&amp;OK</string>
+      </property>
+      <property name="shortcut" >
+       <string/>
+      </property>
+      <property name="autoDefault" >
+       <bool>true</bool>
+      </property>
+      <property name="default" >
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="buttonCancel" >
+      <property name="text" >
+       <string>&amp;Cancel</string>
+      </property>
+      <property name="shortcut" >
+       <string/>
+      </property>
+      <property name="autoDefault" >
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="Q3GroupBox" name="grpWeb" >
+   <property name="title" >
+    <string>Web Interface Definition</string>
+   </property>
+   <layout class="QGridLayout" >
+    <property name="margin" >
+     <number>-1</number>
+    </property>
+    <property name="spacing" >
+     <number>5</number>
+    </property>
+    <item row="0" column="1" >
+     <widget class="QLineEdit" name="txtWebTemplate" >
+      <property name="toolTip" >
+       <string>&lt;html>&lt;head>&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; />&lt;/head>&lt;body style=&quot; white-space: pre-wrap; font-family:Sans Serif; font-weight:400; font-style:normal; text-decoration:none;&quot;>&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>Path to the template file&lt;/p>&lt;/body>&lt;/html></string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1" >
+     <widget class="QLineEdit" name="txtWebFooter" />
+    </item>
+    <item row="1" column="1" >
+     <widget class="QLineEdit" name="txtWebHeader" />
+    </item>
+    <item row="2" column="2" >
+     <widget class="QPushButton" name="btnChooseFooterFile" >
+      <property name="text" >
+       <string>...</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0" >
+     <widget class="QLabel" name="textLabel5_3" >
+      <property name="text" >
+       <string>Footer</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="2" >
+     <widget class="QPushButton" name="btnChooseHeaderFile" >
+      <property name="text" >
+       <string>...</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0" >
+     <widget class="QLabel" name="textLabel5" >
+      <property name="text" >
+       <string>Header</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0" >
+     <widget class="QLabel" name="textLabel5_2" >
+      <property name="text" >
+       <string>Template</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="2" >
+     <widget class="QPushButton" name="btnChooseTemplateFile" >
+      <property name="text" >
+       <string>...</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+   <widget class="QWidget" name="" />
+   <widget class="QWidget" name="" />
+   <widget class="QWidget" name="" />
+  </widget>
+  <widget class="QLabel" name="textLabel7" >
+   <property name="geometry" >
+    <rect>
+     <x>9</x>
+     <y>9</y>
+     <width>102</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>Map file</string>
+   </property>
+  </widget>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>