diff --git a/src/Gui/DlgReportView.ui b/src/Gui/DlgReportView.ui
index a8d6764c5..eb20d4634 100644
--- a/src/Gui/DlgReportView.ui
+++ b/src/Gui/DlgReportView.ui
@@ -1,122 +1,69 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>Gui::Dialog::DlgReportView</class>
- <widget class="QWidget" name="Gui::Dialog::DlgReportView" >
-  <property name="geometry" >
+ <widget class="QWidget" name="Gui::Dialog::DlgReportView">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>432</width>
-    <height>404</height>
+    <height>411</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Output window</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="2" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>410</width>
-       <height>71</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="0" >
-    <widget class="Gui::PrefCheckBox" name="pythonOutput" >
-     <property name="text" >
-      <string>Redirect internal Python output to report view</string>
-     </property>
-     <property name="prefEntry" stdset="0" >
-      <cstring>RedirectPythonOutput</cstring>
-     </property>
-     <property name="prefPath" stdset="0" >
-      <cstring>OutputWindow</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" >
-    <widget class="Gui::PrefCheckBox" name="pythonError" >
-     <property name="text" >
-      <string>Redirect internal Python errors to report view</string>
-     </property>
-     <property name="prefEntry" stdset="0" >
-      <cstring>RedirectPythonErrors</cstring>
-     </property>
-     <property name="prefPath" stdset="0" >
-      <cstring>OutputWindow</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="groupBox1" >
-     <property name="title" >
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="groupBox1">
+     <property name="title">
       <string>Output</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="margin">
        <number>11</number>
       </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="Gui::PrefCheckBox" name="checkLogging" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="Gui::PrefCheckBox" name="checkLogging">
+        <property name="text">
          <string>Record log messages</string>
         </property>
-        <property name="prefEntry" stdset="0" >
+        <property name="prefEntry" stdset="0">
          <cstring>checkLogging</cstring>
         </property>
-        <property name="prefPath" stdset="0" >
+        <property name="prefPath" stdset="0">
          <cstring>OutputWindow</cstring>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="Gui::PrefCheckBox" name="checkWarning" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="Gui::PrefCheckBox" name="checkWarning">
+        <property name="text">
          <string>Record warnings</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
-        <property name="prefEntry" stdset="0" >
+        <property name="prefEntry" stdset="0">
          <cstring>checkWarning</cstring>
         </property>
-        <property name="prefPath" stdset="0" >
+        <property name="prefPath" stdset="0">
          <cstring>OutputWindow</cstring>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="Gui::PrefCheckBox" name="checkError" >
-        <property name="text" >
+      <item row="2" column="0">
+       <widget class="Gui::PrefCheckBox" name="checkError">
+        <property name="text">
          <string>Record error messages</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
-        <property name="prefEntry" stdset="0" >
+        <property name="prefEntry" stdset="0">
          <cstring>checkError</cstring>
         </property>
-        <property name="prefPath" stdset="0" >
+        <property name="prefPath" stdset="0">
          <cstring>OutputWindow</cstring>
         </property>
        </widget>
@@ -124,27 +71,27 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QGroupBox" name="groupBox2" >
-     <property name="title" >
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="groupBox2">
+     <property name="title">
       <string>Colors</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="0" column="1" >
+      <item row="0" column="1">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::MinimumExpanding</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
@@ -152,194 +99,30 @@
         </property>
        </spacer>
       </item>
-      <item row="0" column="0" >
-       <layout class="QGridLayout" >
-        <property name="margin" >
+      <item row="0" column="0">
+       <layout class="QGridLayout">
+        <property name="margin">
          <number>0</number>
         </property>
-        <property name="spacing" >
+        <property name="spacing">
          <number>6</number>
         </property>
-        <item row="3" column="1" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>211</width>
-            <height>23</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="3" column="2" >
-         <widget class="Gui::PrefColorButton" name="colorError" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>3</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize" >
-           <size>
-            <width>75</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text" >
-           <string/>
-          </property>
-          <property name="color" >
-           <color>
-            <red>255</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </property>
-          <property name="prefEntry" stdset="0" >
-           <cstring>colorError</cstring>
-          </property>
-          <property name="prefPath" stdset="0" >
-           <cstring>OutputWindow</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Ignored</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>211</width>
-            <height>23</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="0" column="0" >
-         <widget class="QLabel" name="textLabel1" >
-          <property name="text" >
+        <item row="0" column="0">
+         <widget class="QLabel" name="textLabel1">
+          <property name="text">
            <string>Normal messages:</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="2" >
-         <widget class="Gui::PrefColorButton" name="colorLogging" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>3</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize" >
-           <size>
-            <width>75</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text" >
-           <string/>
-          </property>
-          <property name="color" >
-           <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>255</blue>
-           </color>
-          </property>
-          <property name="prefEntry" stdset="0" >
-           <cstring>colorLogging</cstring>
-          </property>
-          <property name="prefPath" stdset="0" >
-           <cstring>OutputWindow</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1" >
+        <item row="0" column="1">
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeType" >
+          <property name="sizeType">
            <enum>QSizePolicy::Ignored</enum>
           </property>
-          <property name="sizeHint" >
-           <size>
-            <width>211</width>
-            <height>23</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="1" column="0" >
-         <widget class="QLabel" name="textLabel2" >
-          <property name="text" >
-           <string>Log messages:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="2" >
-         <widget class="Gui::PrefColorButton" name="colorWarning" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>3</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize" >
-           <size>
-            <width>75</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text" >
-           <string/>
-          </property>
-          <property name="color" >
-           <color>
-            <red>255</red>
-            <green>170</green>
-            <blue>0</blue>
-           </color>
-          </property>
-          <property name="prefEntry" stdset="0" >
-           <cstring>colorWarning</cstring>
-          </property>
-          <property name="prefPath" stdset="0" >
-           <cstring>OutputWindow</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0" >
-         <widget class="QLabel" name="textLabel3" >
-          <property name="text" >
-           <string>Warnings:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType" >
-           <enum>QSizePolicy::Ignored</enum>
-          </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>214</width>
             <height>23</height>
@@ -347,43 +130,199 @@
           </property>
          </spacer>
         </item>
-        <item row="3" column="0" >
-         <widget class="QLabel" name="textLabel4" >
-          <property name="text" >
-           <string>Errors:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2" >
-         <widget class="Gui::PrefColorButton" name="colorText" >
-          <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>0</vsizetype>
+        <item row="0" column="2">
+         <widget class="Gui::PrefColorButton" name="colorText">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="minimumSize" >
+          <property name="minimumSize">
            <size>
             <width>75</width>
             <height>0</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string/>
           </property>
-          <property name="color" >
+          <property name="color">
            <color>
             <red>0</red>
             <green>0</green>
             <blue>0</blue>
            </color>
           </property>
-          <property name="prefEntry" stdset="0" >
+          <property name="prefEntry" stdset="0">
            <cstring>colorText</cstring>
           </property>
-          <property name="prefPath" stdset="0" >
+          <property name="prefPath" stdset="0">
+           <cstring>OutputWindow</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="textLabel2">
+          <property name="text">
+           <string>Log messages:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Ignored</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>211</width>
+            <height>23</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="2">
+         <widget class="Gui::PrefColorButton" name="colorLogging">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>75</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="color">
+           <color>
+            <red>0</red>
+            <green>0</green>
+            <blue>255</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>colorLogging</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>OutputWindow</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="textLabel3">
+          <property name="text">
+           <string>Warnings:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Ignored</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>211</width>
+            <height>23</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="2" column="2">
+         <widget class="Gui::PrefColorButton" name="colorWarning">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>75</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="color">
+           <color>
+            <red>255</red>
+            <green>170</green>
+            <blue>0</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>colorWarning</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>OutputWindow</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="textLabel4">
+          <property name="text">
+           <string>Errors:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Expanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>211</width>
+            <height>23</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="3" column="2">
+         <widget class="Gui::PrefColorButton" name="colorError">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>75</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="color">
+           <color>
+            <red>255</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>colorError</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
            <cstring>OutputWindow</cstring>
           </property>
          </widget>
@@ -393,25 +332,88 @@
      </layout>
     </widget>
    </item>
+   <item row="2" column="0">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Python interpreter</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="Gui::PrefCheckBox" name="pythonOutput">
+        <property name="text">
+         <string>Redirect internal Python output to report view</string>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>RedirectPythonOutput</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>OutputWindow</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="Gui::PrefCheckBox" name="pythonError">
+        <property name="text">
+         <string>Redirect internal Python errors to report view</string>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>RedirectPythonErrors</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>OutputWindow</cstring>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>410</width>
+       <height>71</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
+  <customwidget>
+   <class>Gui::ColorButton</class>
+   <extends>QPushButton</extends>
+   <header>Gui/Widgets.h</header>
+  </customwidget>
   <customwidget>
    <class>Gui::PrefColorButton</class>
    <extends>Gui::ColorButton</extends>
    <header>Gui/PrefWidgets.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
    <class>Gui::PrefCheckBox</class>
    <extends>QCheckBox</extends>
    <header>Gui/PrefWidgets.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>checkLogging</tabstop>
+  <tabstop>checkWarning</tabstop>
+  <tabstop>checkError</tabstop>
+  <tabstop>colorText</tabstop>
+  <tabstop>colorLogging</tabstop>
+  <tabstop>colorWarning</tabstop>
+  <tabstop>colorError</tabstop>
+  <tabstop>pythonOutput</tabstop>
+  <tabstop>pythonError</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>