diff --git a/RetroShare.pro b/RetroShare.pro
index 2046c7a53..d7abf8cbd 100644
--- a/RetroShare.pro
+++ b/RetroShare.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-        libbitdht\src\libbitdht.pro \
-        libretroshare\src\libretroshare.pro \
-        retroshare-gui\src\RetroShare.pro
\ No newline at end of file
+        libbitdht/src/libbitdht.pro \
+        libretroshare/src/libretroshare.pro \
+        retroshare-gui/src/RetroShare.pro
diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro
index 8e509a11c..b5a5a3216 100644
--- a/retroshare-gui/src/RetroShare.pro
+++ b/retroshare-gui/src/RetroShare.pro
@@ -169,14 +169,14 @@ DEPENDPATH += . \
             gui \
             lang \
             util \
-            gui\bwgraph \
-            gui\chat \
-            gui\connect \
-            gui\images \
-            gui\common \
-            gui\toaster \
-            gui\help\browser \
-            gui\elastic
+            gui/bwgraph \
+            gui/chat \
+            gui/connect \
+            gui/images \
+            gui/common \
+            gui/toaster \
+            gui/help/browser \
+            gui/elastic
 
 INCLUDEPATH += ../../libretroshare/src/
 
diff --git a/retroshare-gui/src/gui/DetailsDialog.ui b/retroshare-gui/src/gui/DetailsDialog.ui
index 1f22a156d..a443038ac 100644
--- a/retroshare-gui/src/gui/DetailsDialog.ui
+++ b/retroshare-gui/src/gui/DetailsDialog.ui
@@ -31,13 +31,13 @@
       <attribute name="title">
        <string>General</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_3">
+      <layout class="QGridLayout">
        <item row="0" column="0">
         <widget class="QGroupBox" name="genralgroupBox">
          <property name="title">
           <string>General</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout">
           <item row="0" column="0">
            <widget class="QLabel" name="name_label">
             <property name="maximumSize">
@@ -194,7 +194,7 @@
          <property name="title">
           <string>Transfer</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_2">
+         <layout class="QGridLayout">
           <item row="0" column="0">
            <widget class="QLabel" name="sources_label">
             <property name="text">
@@ -352,7 +352,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabcomments">
+     <widget class="QWidget">
       <attribute name="icon">
        <iconset resource="images.qrc">
         <normaloff>:/images/filecomments.png</normaloff>:/images/filecomments.png</iconset>
@@ -366,7 +366,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabcomments">
+     <widget class="QWidget">
       <attribute name="title">
        <string>retroshare link(s)</string>
       </attribute>
diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui
index 4193d7862..fb0c4f82a 100644
--- a/retroshare-gui/src/gui/ForumsDialog.ui
+++ b/retroshare-gui/src/gui/ForumsDialog.ui
@@ -505,7 +505,7 @@
   <property name="contextMenuPolicy">
    <enum>Qt::DefaultContextMenu</enum>
   </property>
-  <layout class="QGridLayout" name="gridLayout_4">
+  <layout class="QGridLayout">
    <property name="leftMargin">
     <number>9</number>
    </property>
@@ -533,7 +533,7 @@
       <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
-      <layout class="QGridLayout" name="gridLayout_3">
+      <layout class="QGridLayout">
        <property name="margin">
         <number>0</number>
        </property>
@@ -557,12 +557,12 @@ border: 1px solid #CCCCCC;}
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
-         <layout class="QGridLayout" name="gridLayout_6">
+         <layout class="QGridLayout">
           <property name="margin">
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <layout class="QGridLayout" name="_2">
+           <layout class="QGridLayout">
             <property name="verticalSpacing">
              <number>0</number>
             </property>
@@ -697,7 +697,7 @@ p, li { white-space: pre-wrap; }
        <enum>Qt::Vertical</enum>
       </property>
       <widget class="QWidget" name="layoutWidget">
-       <layout class="QGridLayout" name="gridLayout_2">
+       <layout class="QGridLayout">
         <item row="1" column="0">
          <layout class="QHBoxLayout">
           <item>
@@ -840,7 +840,7 @@ background: white;
          </widget>
         </item>
         <item row="5" column="0">
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout">
           <item row="0" column="1">
            <widget class="QLabel" name="threadlabel">
             <property name="sizePolicy">
@@ -1019,7 +1019,7 @@ border: 1px solid #CCCCCC;}</string>
           <property name="frameShadow">
            <enum>QFrame::Raised</enum>
           </property>
-          <layout class="QGridLayout" name="gridLayout_5">
+          <layout class="QGridLayout">
            <property name="margin">
             <number>2</number>
            </property>
diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui
index 03aeece92..bb5f2735a 100644
--- a/retroshare-gui/src/gui/NetworkDialog.ui
+++ b/retroshare-gui/src/gui/NetworkDialog.ui
@@ -355,7 +355,7 @@ subcontrol-position: bottom right;
           <attribute name="title">
            <string>Network Status</string>
           </attribute>
-          <layout class="QGridLayout" name="gridLayout">
+          <layout class="QGridLayout">
            <item row="0" column="0">
             <layout class="QGridLayout">
              <property name="leftMargin">
diff --git a/retroshare-gui/src/gui/TransfersDialog.ui b/retroshare-gui/src/gui/TransfersDialog.ui
index 89433b933..7fc5884cd 100644
--- a/retroshare-gui/src/gui/TransfersDialog.ui
+++ b/retroshare-gui/src/gui/TransfersDialog.ui
@@ -502,14 +502,14 @@
   <property name="contextMenuPolicy">
    <enum>Qt::PreventContextMenu</enum>
   </property>
-  <layout class="QGridLayout" name="gridLayout_8">
+  <layout class="QGridLayout">
    <item row="0" column="0">
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <widget class="QWidget" name="layoutWidget">
-      <layout class="QGridLayout" name="gridLayout_2">
+      <layout class="QGridLayout">
        <property name="spacing">
         <number>0</number>
        </property>
@@ -678,7 +678,7 @@ p, li { white-space: pre-wrap; }
        <attribute name="title">
         <string>Uploads</string>
        </attribute>
-       <layout class="QGridLayout" name="gridLayout">
+       <layout class="QGridLayout">
         <property name="margin">
          <number>0</number>
         </property>
@@ -708,7 +708,7 @@ p, li { white-space: pre-wrap; }
        <attribute name="title">
         <string>Selected transfer</string>
        </attribute>
-       <layout class="QGridLayout" name="gridLayout_7">
+       <layout class="QGridLayout">
         <property name="margin">
          <number>0</number>
         </property>
@@ -739,12 +739,12 @@ p, li { white-space: pre-wrap; }
          </widget>
         </item>
         <item row="1" column="0">
-         <layout class="QGridLayout" name="gridLayout_6">
+         <layout class="QGridLayout">
           <property name="margin">
            <number>6</number>
           </property>
           <item row="0" column="0">
-           <layout class="QGridLayout" name="gridLayout_5">
+           <layout class="QGridLayout">
             <item row="0" column="0">
              <widget class="QLabel" name="label">
               <property name="text">
@@ -765,7 +765,7 @@ p, li { white-space: pre-wrap; }
            </layout>
           </item>
           <item row="0" column="1">
-           <layout class="QGridLayout" name="gridLayout_4">
+           <layout class="QGridLayout">
             <item row="0" column="0">
              <widget class="QLabel" name="label_5">
               <property name="text">
@@ -786,7 +786,7 @@ p, li { white-space: pre-wrap; }
            </layout>
           </item>
           <item row="0" column="2">
-           <layout class="QGridLayout" name="gridLayout_3">
+           <layout class="QGridLayout">
             <item row="0" column="0">
              <widget class="QLabel" name="label_7">
               <property name="text">
diff --git a/retroshare-gui/src/gui/channels/ChannelDetails.ui b/retroshare-gui/src/gui/channels/ChannelDetails.ui
index f5c8a2549..cfefe93ab 100644
--- a/retroshare-gui/src/gui/channels/ChannelDetails.ui
+++ b/retroshare-gui/src/gui/channels/ChannelDetails.ui
@@ -17,7 +17,7 @@
    <iconset resource="../images.qrc">
     <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
+  <layout class="QGridLayout">
    <item row="0" column="0">
     <widget class="QTabWidget" name="stabWidget">
      <property name="currentIndex">
@@ -37,7 +37,7 @@
          <property name="title">
           <string>Channel Info</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_2">
+         <layout class="QGridLayout">
           <item row="0" column="0">
            <widget class="QLabel" name="label">
             <property name="text">
@@ -91,7 +91,7 @@
             <property name="title">
              <string>Channel Description</string>
             </property>
-            <layout class="QGridLayout" name="gridLayout">
+            <layout class="QGridLayout">
              <item row="0" column="0">
               <widget class="QTextEdit" name="DescriptiontextEdit"/>
              </item>
diff --git a/retroshare-gui/src/gui/dht/DhtWindow.ui b/retroshare-gui/src/gui/dht/DhtWindow.ui
index ff52da43f..f2ecf0193 100644
--- a/retroshare-gui/src/gui/dht/DhtWindow.ui
+++ b/retroshare-gui/src/gui/dht/DhtWindow.ui
@@ -116,7 +116,7 @@
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
-      <widget class="QWidget" name="layoutWidget">
+      <widget class="QWidget">
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <property name="spacing">
          <number>0</number>
@@ -189,7 +189,7 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="layoutWidget">
+      <widget class="QWidget">
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
          <widget class="QLabel" name="dhtLabel">
diff --git a/retroshare-gui/src/gui/feeds/ChanNewItem.ui b/retroshare-gui/src/gui/feeds/ChanNewItem.ui
index a8a11978b..2bb10158b 100644
--- a/retroshare-gui/src/gui/feeds/ChanNewItem.ui
+++ b/retroshare-gui/src/gui/feeds/ChanNewItem.ui
@@ -37,9 +37,9 @@ border-radius: 10px;}</string>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
+     <layout class="QGridLayout">
       <item row="0" column="0" rowspan="2">
-       <layout class="QGridLayout" name="gridLayout">
+       <layout class="QGridLayout">
         <item row="0" column="0" rowspan="2">
          <widget class="QLabel" name="logo_label">
           <property name="minimumSize">
@@ -218,7 +218,7 @@ border-radius: 2px;}</string>
            <property name="title">
             <string>Channel Decscription</string>
            </property>
-           <layout class="QGridLayout" name="gridLayout_5">
+           <layout class="QGridLayout">
             <item row="0" column="0">
              <widget class="QLabel" name="iconLabel">
               <property name="text">
diff --git a/retroshare-gui/src/gui/feeds/ForumMsgItem.ui b/retroshare-gui/src/gui/feeds/ForumMsgItem.ui
index b1bffbcb4..c2e281855 100644
--- a/retroshare-gui/src/gui/feeds/ForumMsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/ForumMsgItem.ui
@@ -37,9 +37,9 @@ border-radius: 10px}</string>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_6">
+     <layout class="QGridLayout">
       <item row="0" column="0">
-       <layout class="QGridLayout" name="gridLayout">
+       <layout class="QGridLayout">
         <item row="0" column="0">
          <widget class="QLabel" name="label">
           <property name="minimumSize">
@@ -101,7 +101,7 @@ border-radius: 10px}</string>
        </layout>
       </item>
       <item row="0" column="1">
-       <layout class="QGridLayout" name="gridLayout_2">
+       <layout class="QGridLayout">
         <item row="0" column="0">
          <spacer name="horizontalSpacer">
           <property name="orientation">
@@ -288,7 +288,7 @@ border-radius: 10px}</string>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QGridLayout" name="gridLayout_4">
+        <layout class="QGridLayout">
          <item row="0" column="0" rowspan="2">
           <widget class="QLabel" name="avatarlabel">
            <property name="minimumSize">
@@ -455,7 +455,7 @@ border-radius: 10px}</string>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QGridLayout" name="gridLayout_5">
+        <layout class="QGridLayout">
          <item row="0" column="0" rowspan="3">
           <widget class="QLabel" name="nextavatarlabel">
            <property name="minimumSize">
@@ -589,7 +589,7 @@ border-radius: 10px}</string>
        </widget>
       </item>
       <item row="5" column="0" colspan="2">
-       <layout class="QGridLayout" name="gridLayout_3">
+       <layout class="QGridLayout">
         <item row="0" column="0">
          <spacer name="horizontalSpacer_3">
           <property name="orientation">
diff --git a/retroshare-gui/src/gui/feeds/MsgItem.ui b/retroshare-gui/src/gui/feeds/MsgItem.ui
index 6f2a4c7c0..99d77348a 100644
--- a/retroshare-gui/src/gui/feeds/MsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/MsgItem.ui
@@ -37,7 +37,7 @@ border-radius: 10px}</string>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
+     <layout class="QGridLayout">
       <property name="verticalSpacing">
        <number>0</number>
       </property>
@@ -67,7 +67,7 @@ stop: 0 #2291E0, stop: 1 #3EB3FF);
        </widget>
       </item>
       <item row="0" column="1" colspan="4">
-       <layout class="QGridLayout" name="gridLayout">
+       <layout class="QGridLayout">
         <item row="0" column="0">
          <widget class="QLabel" name="titleLabel">
           <property name="sizePolicy">
diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui
index 8c90cd15d..1db0e6d0f 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.ui
+++ b/retroshare-gui/src/gui/feeds/PeerItem.ui
@@ -37,7 +37,7 @@ border-radius: 10px}</string>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_5">
+     <layout class="QGridLayout">
       <property name="verticalSpacing">
        <number>0</number>
       </property>
@@ -52,7 +52,7 @@ border-radius: 10px}</string>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QGridLayout" name="gridLayout_4">
+        <layout class="QGridLayout">
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -94,7 +94,7 @@ border-radius: 10px}</string>
           </widget>
          </item>
          <item row="0" column="1">
-          <layout class="QGridLayout" name="gridLayout">
+          <layout class="QGridLayout">
            <item row="0" column="0">
             <widget class="QLabel" name="peernameLabel">
              <property name="styleSheet">
@@ -279,11 +279,6 @@ border-radius: 10px}</string>
           </layout>
          </item>
         </layout>
-        <zorder></zorder>
-        <zorder>avatar_label</zorder>
-        <zorder></zorder>
-        <zorder></zorder>
-        <zorder></zorder>
        </widget>
       </item>
       <item row="1" column="0">
@@ -300,7 +295,7 @@ border-radius: 10px}</string>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QGridLayout" name="gridLayout_3">
+        <layout class="QGridLayout">
          <property name="verticalSpacing">
           <number>2</number>
          </property>
@@ -354,7 +349,7 @@ border-radius: 10px}</string>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QGridLayout" name="gridLayout_2">
+        <layout class="QGridLayout">
          <item row="1" column="0">
           <spacer name="verticalSpacer">
            <property name="orientation">
diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.ui b/retroshare-gui/src/gui/feeds/SecurityItem.ui
index abe561a63..d6afff92f 100644
--- a/retroshare-gui/src/gui/feeds/SecurityItem.ui
+++ b/retroshare-gui/src/gui/feeds/SecurityItem.ui
@@ -37,7 +37,7 @@ border-radius: 10px}</string>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_5">
+     <layout class="QGridLayout">
       <property name="verticalSpacing">
        <number>0</number>
       </property>
@@ -52,7 +52,7 @@ border-radius: 10px}</string>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QGridLayout" name="gridLayout_4">
+        <layout class="QGridLayout">
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -94,7 +94,7 @@ border-radius: 10px}</string>
           </widget>
          </item>
          <item row="0" column="1">
-          <layout class="QGridLayout" name="gridLayout">
+          <layout class="QGridLayout">
            <item row="0" column="0">
             <widget class="QLabel" name="peernameLabel">
              <property name="styleSheet">
@@ -279,11 +279,6 @@ border-radius: 10px}</string>
           </layout>
          </item>
         </layout>
-        <zorder></zorder>
-        <zorder>avatar_label</zorder>
-        <zorder></zorder>
-        <zorder></zorder>
-        <zorder></zorder>
        </widget>
       </item>
       <item row="1" column="0">
@@ -300,7 +295,7 @@ border-radius: 10px}</string>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QGridLayout" name="gridLayout_3">
+        <layout class="QGridLayout">
          <property name="verticalSpacing">
           <number>2</number>
          </property>
@@ -354,7 +349,7 @@ border-radius: 10px}</string>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QGridLayout" name="gridLayout_2">
+        <layout class="QGridLayout">
          <item row="1" column="0">
           <spacer name="verticalSpacer">
            <property name="orientation">
diff --git a/retroshare-gui/src/gui/forums/ForumDetails.ui b/retroshare-gui/src/gui/forums/ForumDetails.ui
index 190451ae3..0030f2ffe 100644
--- a/retroshare-gui/src/gui/forums/ForumDetails.ui
+++ b/retroshare-gui/src/gui/forums/ForumDetails.ui
@@ -17,7 +17,7 @@
    <iconset resource="../images.qrc">
     <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
+  <layout class="QGridLayout">
    <item row="0" column="0">
     <widget class="QTabWidget" name="stabWidget">
      <property name="currentIndex">
@@ -37,7 +37,7 @@
          <property name="title">
           <string>Forum Info</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_2">
+         <layout class="QGridLayout">
           <item row="0" column="0">
            <widget class="QLabel" name="label">
             <property name="text">
@@ -91,7 +91,7 @@
             <property name="title">
              <string>Forum Description</string>
             </property>
-            <layout class="QGridLayout" name="gridLayout">
+            <layout class="QGridLayout">
              <item row="0" column="0">
               <widget class="QTextEdit" name="DescriptiontextEdit"/>
              </item>
@@ -111,13 +111,13 @@
       <attribute name="title">
        <string>Security</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_5">
+      <layout class="QGridLayout">
        <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox_3">
          <property name="title">
           <string>Allowed Messages</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_4">
+         <layout class="QGridLayout">
           <item row="0" column="0">
            <widget class="QRadioButton" name="radioButton_authd">
             <property name="text">
@@ -156,7 +156,7 @@
     </widget>
    </item>
    <item row="1" column="0">
-    <layout class="QGridLayout" name="_2">
+    <layout class="QGridLayout">
      <item row="0" column="0">
       <spacer>
        <property name="orientation">
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 2ef20d88f..9ee15fddf 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -336,7 +336,6 @@
         <file>images/rate-5.png</file>
         <file>images/rating.png</file>
         <file>images/records.png</file>
-        <file>images/records.png</file>
         <file>images/removefriend16.png</file>
         <file>images/replymail-pressed.png</file>
         <file>images/replymail24.png</file>
@@ -532,7 +531,6 @@
         <file>smileys/umbrella.png</file>
         <file>smileys/wink.png</file>
         <file>smileys/emotes.acs</file>
-        <file>smileys/moon.png</file>
         <file>smileys/lamp.png</file>
         <file>smileys/good.png</file>
         <file>smileys/drink.png</file>
@@ -549,7 +547,6 @@
         <file>smileys/weather-showers-scattered.png</file>
         <file>smileys/weather-snow.png</file>
         <file>smileys/weather-storm.png</file>
-        <file>smileys/weather-showers.png</file>
         <file>images/connect/connectFriendWatermark.png</file>
         <file>images/connect/connectFriendLogo.png</file>
         <file>images/connect/connectFriendBanner.png</file>
diff --git a/retroshare-gui/src/gui/profile/ProfileEdit.ui b/retroshare-gui/src/gui/profile/ProfileEdit.ui
index f21b2578b..a4cdaf000 100644
--- a/retroshare-gui/src/gui/profile/ProfileEdit.ui
+++ b/retroshare-gui/src/gui/profile/ProfileEdit.ui
@@ -21,7 +21,7 @@
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <widget class="QWidget" name="layoutWidget" >
+     <widget class="QWidget">
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QLabel" name="label_6" >
@@ -58,7 +58,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="layoutWidget" >
+     <widget class="QWidget">
       <layout class="QGridLayout" >
        <item row="0" column="0" colspan="2" >
         <widget class="QLabel" name="label_7" >