diff --git a/linkcheck/gui/__init__.py b/linkcheck/gui/__init__.py
index 983edc8f..54245eeb 100644
--- a/linkcheck/gui/__init__.py
+++ b/linkcheck/gui/__init__.py
@@ -161,6 +161,7 @@ class LinkCheckerMain (QtGui.QMainWindow, Ui_MainWindow):
             self.aggregate = None
             self.controlButton.setEnabled(True)
             self.actionSave.setEnabled(True)
+            self.actionDebug.setEnabled(self.options.get_options()["debug"])
             self.treeView.sortByColumn(0, QtCore.Qt.AscendingOrder)
             self.treeView.setSortingEnabled(True)
         elif status == Status.checking:
diff --git a/linkcheck/gui/linkchecker_ui_main.py b/linkcheck/gui/linkchecker_ui_main.py
index e7963475..0ed07f1e 100644
--- a/linkcheck/gui/linkchecker_ui_main.py
+++ b/linkcheck/gui/linkchecker_ui_main.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'ui/main.ui'
 #
-# Created: Fri Dec  3 20:38:45 2010
+# Created: Fri Dec  3 20:48:10 2010
 #      by: PyQt4 UI code generator 4.7.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -73,10 +73,10 @@ class Ui_MainWindow(object):
         self.menubar.setObjectName("menubar")
         self.menuEdit = QtGui.QMenu(self.menubar)
         self.menuEdit.setObjectName("menuEdit")
-        self.menuHelp = QtGui.QMenu(self.menubar)
-        self.menuHelp.setObjectName("menuHelp")
         self.menuLinkChecka = QtGui.QMenu(self.menubar)
         self.menuLinkChecka.setObjectName("menuLinkChecka")
+        self.menuHelp = QtGui.QMenu(self.menubar)
+        self.menuHelp.setObjectName("menuHelp")
         MainWindow.setMenuBar(self.menubar)
         self.statusBar = QtGui.QStatusBar(MainWindow)
         self.statusBar.setObjectName("statusBar")
@@ -127,11 +127,11 @@ class Ui_MainWindow(object):
         self.actionQuit.setIcon(icon8)
         self.actionQuit.setObjectName("actionQuit")
         self.menuEdit.addAction(self.actionOptions)
+        self.menuLinkChecka.addAction(self.actionSave)
+        self.menuLinkChecka.addAction(self.actionQuit)
         self.menuHelp.addAction(self.actionAbout)
         self.menuHelp.addAction(self.actionHelp)
         self.menuHelp.addAction(self.actionDebug)
-        self.menuLinkChecka.addAction(self.actionSave)
-        self.menuLinkChecka.addAction(self.actionQuit)
         self.menubar.addAction(self.menuLinkChecka.menuAction())
         self.menubar.addAction(self.menuEdit.menuAction())
         self.menubar.addAction(self.menuHelp.menuAction())
@@ -146,8 +146,8 @@ class Ui_MainWindow(object):
         self.controlButton.setToolTip(_("Start checking the given URL."))
         self.controlButton.setText(_("Start"))
         self.menuEdit.setTitle(_("Edit"))
-        self.menuHelp.setTitle(_("Help"))
         self.menuLinkChecka.setTitle(_("File"))
+        self.menuHelp.setTitle(_("Help"))
         self.actionAbout.setText(_("About"))
         self.actionHelp.setText(_("Help"))
         self.actionViewOnline.setText(_("View online"))
@@ -160,7 +160,7 @@ class Ui_MainWindow(object):
         self.actionViewParentOnline.setToolTip(_("View parent URL online"))
         self.actionViewParentSource.setText(_("View parent source"))
         self.actionViewParentSource.setToolTip(_("View parent URL source"))
-        self.actionDebug.setText(_("Debug"))
+        self.actionDebug.setText(_("Show debug"))
         self.actionViewProperties.setText(_("View properties"))
         self.actionViewProperties.setToolTip(_("View URL properties"))
         self.actionSave.setText(_("Save results..."))
diff --git a/linkcheck/gui/ui/main.ui b/linkcheck/gui/ui/main.ui
index 8fb55650..f4daebaa 100644
--- a/linkcheck/gui/ui/main.ui
+++ b/linkcheck/gui/ui/main.ui
@@ -158,6 +158,13 @@
     </property>
     <addaction name="actionOptions"/>
    </widget>
+   <widget class="QMenu" name="menuLinkChecka">
+    <property name="title">
+     <string>File</string>
+    </property>
+    <addaction name="actionSave"/>
+    <addaction name="actionQuit"/>
+   </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
      <string>Help</string>
@@ -166,13 +173,6 @@
     <addaction name="actionHelp"/>
     <addaction name="actionDebug"/>
    </widget>
-   <widget class="QMenu" name="menuLinkChecka">
-    <property name="title">
-     <string>File</string>
-    </property>
-    <addaction name="actionSave"/>
-    <addaction name="actionQuit"/>
-   </widget>
    <addaction name="menuLinkChecka"/>
    <addaction name="menuEdit"/>
    <addaction name="menuHelp"/>
@@ -258,7 +258,7 @@
   </action>
   <action name="actionDebug">
    <property name="text">
-    <string>Debug</string>
+    <string>Show debug</string>
    </property>
   </action>
   <action name="actionViewProperties">