diff --git a/TODO b/TODO
index 3831e3044..0945ecedf 100644
--- a/TODO
+++ b/TODO
@@ -39,7 +39,7 @@
 - File selection in a torrent in compact mode???
 - Windows port : http://www.peerweb.nl/qbittorrent/experimentalbuild/testing.zip
 - Make use of QSessionManager to save application state?
-- Make use of dbus on Linux for the single instance instead of socket communication
+- Make use of dbus on Linux for the single instance instead of socket communication?
   (http://techbase.kde.org/Development/Tutorials/D-Bus/Accessing_Interfaces)
 - Write documentation
 - Allow the user to see when peers were blocked thanks to IPFilter. Maybe in a file in order not to spam the GUI.
diff --git a/src/GUI.cpp b/src/GUI.cpp
index 10119f9ee..520d635ce 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -101,7 +101,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
   actionPreview_file->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/preview.png")));
   actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
   actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/downloading.png")));
-//   actionDocumentation->setIcon(QIcon(QString::fromUtf8(":/Icons/help.png")));
+  actionDocumentation->setIcon(QIcon(QString::fromUtf8(":/Icons/help.png")));
   connecStatusLblIcon = new QLabel();
   connecStatusLblIcon->setFrameShape(QFrame::NoFrame);
   connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/disconnected.png")));
@@ -215,6 +215,10 @@ void GUI::on_actionWebsite_triggered(){
    QDesktopServices::openUrl(QUrl("http://www.qbittorrent.org"));
 }
 
+void GUI::on_actionDocumentation_triggered(){
+  QDesktopServices::openUrl(QUrl("http://wiki.qbittorrent.org"));
+}
+
 void GUI::on_actionBugReport_triggered(){
    QDesktopServices::openUrl(QUrl("http://bugs.qbittorrent.org"));
 }
diff --git a/src/GUI.h b/src/GUI.h
index 3f290020f..ad8c990f3 100644
--- a/src/GUI.h
+++ b/src/GUI.h
@@ -139,6 +139,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void on_actionDelete_triggered();
     void on_actionSet_download_limit_triggered();
     void on_actionSet_upload_limit_triggered();
+    void on_actionDocumentation_triggered();
     void checkConnectionStatus();
     void configureSession(bool deleteOptions);
     void processParams(const QStringList& params);
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 4edd4cddc..7ba1ef36e 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -17,12 +17,21 @@
   </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QVBoxLayout" >
-    <property name="margin" >
-     <number>9</number>
-    </property>
     <property name="spacing" >
      <number>6</number>
     </property>
+    <property name="leftMargin" >
+     <number>9</number>
+    </property>
+    <property name="topMargin" >
+     <number>9</number>
+    </property>
+    <property name="rightMargin" >
+     <number>9</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>9</number>
+    </property>
     <item>
      <widget class="QTabWidget" name="tabs" >
       <property name="tabPosition" >
@@ -36,28 +45,55 @@
         <string>Downloads</string>
        </attribute>
        <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>9</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="leftMargin" >
+         <number>9</number>
+        </property>
+        <property name="topMargin" >
+         <number>9</number>
+        </property>
+        <property name="rightMargin" >
+         <number>9</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>9</number>
+        </property>
         <item>
          <layout class="QVBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
           <property name="spacing" >
            <number>6</number>
           </property>
+          <property name="leftMargin" >
+           <number>0</number>
+          </property>
+          <property name="topMargin" >
+           <number>0</number>
+          </property>
+          <property name="rightMargin" >
+           <number>0</number>
+          </property>
+          <property name="bottomMargin" >
+           <number>0</number>
+          </property>
           <item>
            <layout class="QHBoxLayout" >
-            <property name="margin" >
-             <number>0</number>
-            </property>
             <property name="spacing" >
              <number>6</number>
             </property>
+            <property name="leftMargin" >
+             <number>0</number>
+            </property>
+            <property name="topMargin" >
+             <number>0</number>
+            </property>
+            <property name="rightMargin" >
+             <number>0</number>
+            </property>
+            <property name="bottomMargin" >
+             <number>0</number>
+            </property>
             <item>
              <spacer>
               <property name="orientation" >
@@ -252,20 +288,38 @@
         </item>
         <item>
          <layout class="QVBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
           <property name="spacing" >
            <number>6</number>
           </property>
+          <property name="leftMargin" >
+           <number>0</number>
+          </property>
+          <property name="topMargin" >
+           <number>0</number>
+          </property>
+          <property name="rightMargin" >
+           <number>0</number>
+          </property>
+          <property name="bottomMargin" >
+           <number>0</number>
+          </property>
           <item>
            <layout class="QHBoxLayout" >
-            <property name="margin" >
-             <number>0</number>
-            </property>
             <property name="spacing" >
              <number>6</number>
             </property>
+            <property name="leftMargin" >
+             <number>0</number>
+            </property>
+            <property name="topMargin" >
+             <number>0</number>
+            </property>
+            <property name="rightMargin" >
+             <number>0</number>
+            </property>
+            <property name="bottomMargin" >
+             <number>0</number>
+            </property>
             <item>
              <widget class="QLabel" name="info_icon" >
               <property name="minimumSize" >
@@ -327,9 +381,7 @@
           <item>
            <widget class="QTextBrowser" name="infoBar" >
             <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>7</hsizetype>
-              <vsizetype>0</vsizetype>
+             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -390,6 +442,7 @@
     <addaction name="actionAbout" />
     <addaction name="actionBugReport" />
     <addaction name="actionWebsite" />
+    <addaction name="actionDocumentation" />
    </widget>
    <widget class="QMenu" name="menu_File" >
     <property name="title" >
@@ -425,7 +478,10 @@
     </size>
    </property>
    <attribute name="toolBarArea" >
-    <number>4</number>
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <bool>false</bool>
    </attribute>
    <addaction name="actionOpen" />
    <addaction name="actionDownload_from_URL" />
@@ -540,6 +596,11 @@
     <string>Set download limit</string>
    </property>
   </action>
+  <action name="actionDocumentation" >
+   <property name="text" >
+    <string>Documentation</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>