diff --git a/retroshare-gui/src/gui/settings/PluginItem.cpp b/retroshare-gui/src/gui/settings/PluginItem.cpp
index 6ddfe2ef5..285c548ce 100644
--- a/retroshare-gui/src/gui/settings/PluginItem.cpp
+++ b/retroshare-gui/src/gui/settings/PluginItem.cpp
@@ -39,7 +39,6 @@ PluginItem::PluginItem(int id, const QString& pluginTitle,const QString& pluginD
 	QObject::connect(_configure_PB,SIGNAL(clicked()),this,SLOT(configurePlugin())) ;
 	
 	expandFrame->hide();
-
 }
 
 void PluginItem::togglePlugin(bool b)
@@ -54,6 +53,10 @@ void PluginItem::configurePlugin()
 
 void PluginItem::on_moreinfo_label_linkActivated(QString)
 {
-	expandFrame->show();
+	if (expandFrame->isVisible()) {
+		expandFrame->hide();
+	} else {
+		expandFrame->show();
+	}
 }
 
diff --git a/retroshare-gui/src/gui/settings/PluginItem.ui b/retroshare-gui/src/gui/settings/PluginItem.ui
index 4b42d9735..aedc44150 100644
--- a/retroshare-gui/src/gui/settings/PluginItem.ui
+++ b/retroshare-gui/src/gui/settings/PluginItem.ui
@@ -7,10 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>416</width>
-    <height>175</height>
+    <height>157</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_7">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QFrame" name="frame">
      <property name="enabled">
@@ -141,12 +144,6 @@ p, li { white-space: pre-wrap; }
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
              </spacer>
             </item>
             <item>
@@ -204,6 +201,9 @@ p, li { white-space: pre-wrap; }
              <property name="text">
               <string notr="true">TextLabel</string>
              </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="0">
@@ -224,6 +224,9 @@ p, li { white-space: pre-wrap; }
              <property name="text">
               <string notr="true">TextLabel</string>
              </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="0" column="0">
@@ -244,6 +247,9 @@ p, li { white-space: pre-wrap; }
              <property name="text">
               <string notr="true">TextLabel</string>
              </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
           </layout>
diff --git a/retroshare-gui/src/gui/settings/PluginsPage.ui b/retroshare-gui/src/gui/settings/PluginsPage.ui
index 841341d33..73310430b 100644
--- a/retroshare-gui/src/gui/settings/PluginsPage.ui
+++ b/retroshare-gui/src/gui/settings/PluginsPage.ui
@@ -499,21 +499,15 @@
   <property name="contextMenuPolicy">
    <enum>Qt::NoContextMenu</enum>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="4" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QCheckBox" name="enableAll">
+     <property name="text">
+      <string>Authorize all plugins</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="2" column="0">
+   <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Loaded plugins</string>
@@ -523,36 +517,43 @@
        <number>6</number>
       </property>
       <item>
-       <layout class="QVBoxLayout" name="_pluginsLayout">
-        <property name="spacing">
-         <number>0</number>
+       <widget class="QScrollArea" name="scrollArea">
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
         </property>
-       </layout>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
+        <property name="widgetResizable">
+         <bool>true</bool>
         </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
+        <widget class="QWidget" name="scrollAreaWidgetContents">
+         <property name="geometry">
+          <rect>
+           <x>0</x>
+           <y>0</y>
+           <width>391</width>
+           <height>16</height>
+          </rect>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QVBoxLayout" name="_pluginsLayout">
+          <property name="spacing">
+           <number>3</number>
+          </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
+         </layout>
+        </widget>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QCheckBox" name="enableAll">
-     <property name="text">
-      <string>Authorize all plugins</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
+   <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Plugin look-up directories</string>
@@ -561,7 +562,7 @@
       <item>
        <widget class="QTextBrowser" name="_lookupDirectories_TB">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
+         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>