diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index 97ad0d331..7c1bc8cb2 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -1179,6 +1179,7 @@ void ConnectFriendWizard::toggleAdvanced()
 	{
 		ui->cp_Frame->show();
 		ui->toggleadvancedButton->setText("Hide advanced options");
+		resize(sizeHint());
 		AdvancedVisible=true;
 	}
 }
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
index c8acfb914..5e9cd7a34 100644
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
@@ -361,6 +361,12 @@
    <layout class="QVBoxLayout" name="ConclusionPageVLayout">
     <item>
      <widget class="StyledLabel" name="cp_Label">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="palette">
        <palette>
         <active>
@@ -444,6 +450,12 @@
     </item>
     <item>
      <widget class="QLabel" name="alreadyRegisteredLabel">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="text">
        <string>This peer is already on your friend list. Adding it might just set it's ip address.</string>
       </property>
@@ -466,6 +478,12 @@
        </property>
        <item row="0" column="0">
         <widget class="QLabel" name="trustLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Key validity:</string>
          </property>
@@ -473,6 +491,12 @@
        </item>
        <item row="0" column="1">
         <widget class="QLabel" name="trustEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string notr="true">Trust level</string>
          </property>
@@ -480,6 +504,12 @@
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="nameLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Name:</string>
          </property>
@@ -487,6 +517,12 @@
        </item>
        <item row="1" column="1">
         <widget class="QLabel" name="nameEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string notr="true">Name</string>
          </property>
@@ -494,6 +530,12 @@
        </item>
        <item row="3" column="0">
         <widget class="QLabel" name="profileIdLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Profile ID:</string>
          </property>
@@ -501,6 +543,12 @@
        </item>
        <item row="3" column="1">
         <widget class="QLabel" name="profileIdEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string notr="true">Email</string>
          </property>
@@ -508,6 +556,12 @@
        </item>
        <item row="4" column="0">
         <widget class="QLabel" name="nodeLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Location:</string>
          </property>
@@ -515,6 +569,12 @@
        </item>
        <item row="4" column="1">
         <widget class="QLabel" name="nodeEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string notr="true">Location</string>
          </property>
@@ -522,6 +582,12 @@
        </item>
        <item row="6" column="0">
         <widget class="QLabel" name="signersLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Signers</string>
          </property>
@@ -529,6 +595,12 @@
        </item>
        <item row="6" column="1">
         <widget class="QPlainTextEdit" name="signersEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
@@ -539,6 +611,12 @@
        </item>
        <item row="5" column="0">
         <widget class="QLabel" name="ipLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>IP-Addr:</string>
          </property>
@@ -546,6 +624,12 @@
        </item>
        <item row="5" column="1">
         <widget class="QLabel" name="ipEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>IP-Address</string>
          </property>