diff --git a/linkcheck/gui/linkchecker_ui_options.py b/linkcheck/gui/linkchecker_ui_options.py
index 11d5368b..12d2746c 100644
--- a/linkcheck/gui/linkchecker_ui_options.py
+++ b/linkcheck/gui/linkchecker_ui_options.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'ui/options.ui'
 #
-# Created: Wed May 18 22:40:48 2011
+# Created: Thu May 19 20:04:22 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -18,7 +18,7 @@ class Ui_Options(object):
     def setupUi(self, Options):
         Options.setObjectName(_fromUtf8("Options"))
         Options.setWindowModality(QtCore.Qt.ApplicationModal)
-        Options.resize(264, 221)
+        Options.resize(264, 217)
         self.verticalLayout = QtGui.QVBoxLayout(Options)
         self.verticalLayout.setSpacing(2)
         self.verticalLayout.setSizeConstraint(QtGui.QLayout.SetMinimumSize)
@@ -27,29 +27,36 @@ class Ui_Options(object):
         self.tabWidget.setToolTip(_fromUtf8(""))
         self.tabWidget.setObjectName(_fromUtf8("tabWidget"))
         self.gui_options = QtGui.QWidget()
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.gui_options.sizePolicy().hasHeightForWidth())
+        self.gui_options.setSizePolicy(sizePolicy)
         self.gui_options.setToolTip(_fromUtf8(""))
         self.gui_options.setObjectName(_fromUtf8("gui_options"))
         self.verticalLayout_3 = QtGui.QVBoxLayout(self.gui_options)
+        self.verticalLayout_3.setSpacing(2)
         self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
         self.label_8 = QtGui.QLabel(self.gui_options)
         self.label_8.setMinimumSize(QtCore.QSize(240, 0))
         self.label_8.setTextFormat(QtCore.Qt.AutoText)
+        self.label_8.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
         self.label_8.setWordWrap(True)
         self.label_8.setObjectName(_fromUtf8("label_8"))
         self.verticalLayout_3.addWidget(self.label_8)
-        self.line = QtGui.QFrame(self.gui_options)
-        self.line.setFrameShape(QtGui.QFrame.HLine)
-        self.line.setFrameShadow(QtGui.QFrame.Sunken)
-        self.line.setObjectName(_fromUtf8("line"))
-        self.verticalLayout_3.addWidget(self.line)
         self.frame = QtGui.QFrame(self.gui_options)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.frame.sizePolicy().hasHeightForWidth())
+        self.frame.setSizePolicy(sizePolicy)
         self.frame.setFrameShape(QtGui.QFrame.StyledPanel)
         self.frame.setFrameShadow(QtGui.QFrame.Raised)
         self.frame.setObjectName(_fromUtf8("frame"))
         self.formLayout = QtGui.QFormLayout(self.frame)
-        self.formLayout.setSizeConstraint(QtGui.QLayout.SetMinimumSize)
+        self.formLayout.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint)
         self.formLayout.setFieldGrowthPolicy(QtGui.QFormLayout.ExpandingFieldsGrow)
-        self.formLayout.setVerticalSpacing(2)
+        self.formLayout.setSpacing(4)
         self.formLayout.setObjectName(_fromUtf8("formLayout"))
         self.label = QtGui.QLabel(self.frame)
         self.label.setObjectName(_fromUtf8("label"))
@@ -81,10 +88,13 @@ class Ui_Options(object):
         self.debug.setText(_fromUtf8(""))
         self.debug.setObjectName(_fromUtf8("debug"))
         self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.debug)
-        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.formLayout.setItem(3, QtGui.QFormLayout.LabelRole, spacerItem)
         self.verticalLayout_3.addWidget(self.frame)
         self.widget = QtGui.QWidget(self.gui_options)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.widget.sizePolicy().hasHeightForWidth())
+        self.widget.setSizePolicy(sizePolicy)
         self.widget.setObjectName(_fromUtf8("widget"))
         self.horizontalLayout = QtGui.QHBoxLayout(self.widget)
         self.horizontalLayout.setSizeConstraint(QtGui.QLayout.SetMinimumSize)
@@ -99,22 +109,20 @@ class Ui_Options(object):
         self.config_options.setToolTip(_fromUtf8(""))
         self.config_options.setObjectName(_fromUtf8("config_options"))
         self.verticalLayout_5 = QtGui.QVBoxLayout(self.config_options)
+        self.verticalLayout_5.setSpacing(0)
         self.verticalLayout_5.setObjectName(_fromUtf8("verticalLayout_5"))
         self.label_9 = QtGui.QLabel(self.config_options)
         self.label_9.setTextFormat(QtCore.Qt.AutoText)
         self.label_9.setWordWrap(True)
         self.label_9.setObjectName(_fromUtf8("label_9"))
         self.verticalLayout_5.addWidget(self.label_9)
-        self.line_2 = QtGui.QFrame(self.config_options)
-        self.line_2.setFrameShape(QtGui.QFrame.HLine)
-        self.line_2.setFrameShadow(QtGui.QFrame.Sunken)
-        self.line_2.setObjectName(_fromUtf8("line_2"))
-        self.verticalLayout_5.addWidget(self.line_2)
         self.frame_2 = QtGui.QFrame(self.config_options)
         self.frame_2.setFrameShape(QtGui.QFrame.StyledPanel)
         self.frame_2.setFrameShadow(QtGui.QFrame.Raised)
+        self.frame_2.setMidLineWidth(0)
         self.frame_2.setObjectName(_fromUtf8("frame_2"))
         self.verticalLayout_4 = QtGui.QVBoxLayout(self.frame_2)
+        self.verticalLayout_4.setSpacing(1)
         self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4"))
         self.label_6 = QtGui.QLabel(self.frame_2)
         self.label_6.setToolTip(_fromUtf8(""))
@@ -126,13 +134,17 @@ class Ui_Options(object):
         self.sys_config_button.setObjectName(_fromUtf8("sys_config_button"))
         self.verticalLayout_4.addWidget(self.sys_config_button)
         self.label_7 = QtGui.QLabel(self.frame_2)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_7.sizePolicy().hasHeightForWidth())
         self.label_7.setSizePolicy(sizePolicy)
+        self.label_7.setFrameShape(QtGui.QFrame.NoFrame)
+        self.label_7.setLineWidth(0)
         self.label_7.setAlignment(QtCore.Qt.AlignBottom|QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft)
         self.label_7.setWordWrap(True)
+        self.label_7.setMargin(0)
+        self.label_7.setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse)
         self.label_7.setObjectName(_fromUtf8("label_7"))
         self.verticalLayout_4.addWidget(self.label_7)
         self.user_config_button = QtGui.QPushButton(self.frame_2)
@@ -145,7 +157,7 @@ class Ui_Options(object):
         self.verticalLayout.addWidget(self.tabWidget)
 
         self.retranslateUi(Options)
-        self.tabWidget.setCurrentIndex(1)
+        self.tabWidget.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(Options)
 
     def retranslateUi(self, Options):
diff --git a/linkcheck/gui/ui/options.ui b/linkcheck/gui/ui/options.ui
index 10721292..db3ddbc0 100644
--- a/linkcheck/gui/ui/options.ui
+++ b/linkcheck/gui/ui/options.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>264</width>
-    <height>221</height>
+    <height>217</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -29,9 +29,15 @@
       <string/>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="gui_options">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="toolTip">
        <string/>
       </property>
@@ -39,6 +45,9 @@
        <string>GUI options</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
+       <property name="spacing">
+        <number>2</number>
+       </property>
        <item>
         <widget class="QLabel" name="label_8">
          <property name="minimumSize">
@@ -53,20 +62,22 @@
          <property name="textFormat">
           <enum>Qt::AutoText</enum>
          </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         </property>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="Line" name="line">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QFrame" name="frame">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
@@ -75,13 +86,16 @@
          </property>
          <layout class="QFormLayout" name="formLayout">
           <property name="sizeConstraint">
-           <enum>QLayout::SetMinimumSize</enum>
+           <enum>QLayout::SetDefaultConstraint</enum>
           </property>
           <property name="fieldGrowthPolicy">
            <enum>QFormLayout::ExpandingFieldsGrow</enum>
           </property>
+          <property name="horizontalSpacing">
+           <number>4</number>
+          </property>
           <property name="verticalSpacing">
-           <number>2</number>
+           <number>4</number>
           </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label">
@@ -158,24 +172,17 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
-           <spacer name="verticalSpacer_3">
-            <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>
        </item>
        <item>
         <widget class="QWidget" name="widget" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <layout class="QHBoxLayout" name="horizontalLayout">
           <property name="sizeConstraint">
            <enum>QLayout::SetMinimumSize</enum>
@@ -200,6 +207,9 @@
        <string>Configuration files</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_5">
+       <property name="spacing">
+        <number>0</number>
+       </property>
        <item>
         <widget class="QLabel" name="label_9">
          <property name="text">
@@ -213,13 +223,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="Line" name="line_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QFrame" name="frame_2">
          <property name="frameShape">
@@ -228,7 +231,13 @@
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
+         <property name="midLineWidth">
+          <number>0</number>
+         </property>
          <layout class="QVBoxLayout" name="verticalLayout_4">
+          <property name="spacing">
+           <number>1</number>
+          </property>
           <item>
            <widget class="QLabel" name="label_6">
             <property name="toolTip">
@@ -255,7 +264,7 @@
           <item>
            <widget class="QLabel" name="label_7">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -263,6 +272,12 @@
             <property name="toolTip">
              <string>Overrides system wide configuration file settings.</string>
             </property>
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="lineWidth">
+             <number>0</number>
+            </property>
             <property name="text">
              <string>User configuration file
 (overrides system configuration)</string>
@@ -273,6 +288,12 @@
             <property name="wordWrap">
              <bool>true</bool>
             </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <property name="textInteractionFlags">
+             <set>Qt::TextSelectableByMouse</set>
+            </property>
            </widget>
           </item>
           <item>