diff --git a/retroshare-gui/src/gui/help/authors.html b/retroshare-gui/src/gui/help/authors.html
index ff58d51ed..184516b0f 100644
--- a/retroshare-gui/src/gui/help/authors.html
+++ b/retroshare-gui/src/gui/help/authors.html
@@ -14,40 +14,62 @@
 
 <p></p>
 
-<h3>Lead Developers:</h3>
+<h1>Lead Developers</h1>
+<ul>
+<li>&nbsp;<b><a href="mailto:drbob7@users.sourceforge.net">drbob7</a></b></li>
+<li>&nbsp;<b><a href="mailto:defnax@users.sourceforge.net">defnax</a></b></li>
+</ul>
 
-<p>defnax, drbob7</p>
+<h1>TLV Serialiser</h1>
+<ul>
+<li>&nbsp;<b><a href="mailto:chrisparker126@users.sourceforge.net">chrisparker126</a></b></li>
+</ul>
+
+<h1>Broadcasting/Streaming Team</h1>
+<ul>
+<li>&nbsp;<b><a href="mailto:ac506in@users.sourceforge.net">ac506in</a></b></li>
+<li>&nbsp;<b><a href="mailto:jibitesh@users.sourceforge.net">jibitesh</a></b></li>
+<li>&nbsp;<b><a href="mailto:tomerb@users.sourceforge.net">tomerb</a></b></li>
+</ul>
+
+<h1>Persistent storage of keys/channels Developer</h1>
+<ul>
+<li>&nbsp;<b><a href="mailto:wenshuangquan@users.sourceforge.net">wenshuangquan</a></b></li>
+</ul>
+
+<h1>The Release Team</h1>
+<ul>
+<li>&nbsp;<b><a href="mailto:notdefine@users.sourceforge.net">notdefine</a></b></li>
+<li>&nbsp;<b><a href="mailto:agent725@users.sourceforge.net">agent725</a></b></li>
+<li>&nbsp;<b><a href="mailto:the_mgt@users.sourceforge.net">the_mgt</a></b></li>
+</ul>
+
+<h1>Other Developers</h1>
+<ul>
+<li>&nbsp;<b><a href="mailto:csoler@users.sourceforge.net">csoler</a></b></li>
+<li>&nbsp;<b><a href="mailto:stockpicker@users.sourceforge.net">stockpicker</a></b></li>
+<li>&nbsp;<b><a href="mailto:ewensun@users.sourceforge.net">ewensun</a></b></li>
+<li>&nbsp;<b><a href="mailto:cppenthu@users.sourceforge.net">cppenthu</a></b></li>
+<li>&nbsp;<b><a href="mailto:rwoodruff91@users.sourceforge.net">rwoodruff91</a></b></li>
+<li>&nbsp;<b><a href="mailto:raghu-dev@users.sourceforge.net">raghu-dev</a></b></li>
+</ul>
+
+<h1>Developed Search/Channel features</h1>
+<ul>
+<li>&nbsp;<b><a href="mailto:libris@users.sourceforge.net">libris</a></b></li>
+<li>&nbsp;<b><a href="mailto:kashifkaleem@users.sourceforge.net">kashifkaleem</a></b></li>
+</ul>
+
+
+<h1>Developed Smiley,Skinobject,Chat Skin</h1>
+<ul>
+<li>&nbsp;<b><a href="mailto:kernelpanix@users.sourceforge.net">kernelpanix</a></b></li>
+</ul>
+
+<h1>Developed XProgressBar</h1>
+<ul>
+<li>&nbsp;<b><a href="mailto:xesk@users.sourceforge.net">xEsk (Xesc & Technology 2008)</a></b></li>
+</ul>
 
-<h3>Search/Channels Team:</h3>
-
-<p>libris, kashifkaleem</p>
-
-<h3>OpenPGP Team:</h3>
-
-<p>dr_doon, pepy, sktan, shiva</p>
-
-<h3>TLV Serialiser: </h3>
-
-<p>chrisparker126, paolomaldini</p>
-
-<h3>The Release Team:</h3>
-
-<p>notdefine, agent725, the_mgt</p>
-
-<h3>New GUI Developers:</h3>
-
-<p>kernelpanix, mollitz, </p>
-
-<h3>Occasional Developers:</h3>
-
-<p>zhouk, bmeck</p>
-
-<h3>xProgressBar Developer:</h3>
-
-<p>xEsk (Xesc & Technology 2008)</p>
-
-<h3>From Other Projects:</h3>
-
-<p>noragen, dolfcao</p>
 </body>
 </html>
diff --git a/retroshare-gui/src/gui/help/content/de/links.html b/retroshare-gui/src/gui/help/content/de/links.html
index e68a75327..f360b27d1 100644
--- a/retroshare-gui/src/gui/help/content/de/links.html
+++ b/retroshare-gui/src/gui/help/content/de/links.html
@@ -39,10 +39,10 @@
 </tr>
 <tr>
   <td>&nbsp;&nbsp;&nbsp;</td>
-  <td>Wiki</td>
+  <td>RetroShare Forum</td>
   <td>
-    <a href="http://retroshare.wiki.sourceforge.net">
-     http://retroshare.wiki.sourceforge.net</a>
+    <a href="http://retroshare.sourceforge.net/forum">
+     http://retroshare.sourceforge.net/forum</a>
   </td>
 </tr>
 <tr>
diff --git a/retroshare-gui/src/gui/help/content/en/links.html b/retroshare-gui/src/gui/help/content/en/links.html
index 5a6363aa2..16719aefb 100644
--- a/retroshare-gui/src/gui/help/content/en/links.html
+++ b/retroshare-gui/src/gui/help/content/en/links.html
@@ -39,15 +39,15 @@
 </tr>
 <tr>
   <td>&nbsp;&nbsp;&nbsp;</td>
-  <td>Wiki</td>
+  <td>RetroShare Forum</td>
   <td>
-    <a href="http://retroshare.wiki.sourceforge.net">
-     http://retroshare.wiki.sourceforge.net</a>
+    <a href="http://retroshare.sourceforge.net/forum">
+     http://retroshare.sourceforge.net/forum</a>
   </td>
 </tr>
 <tr>
   <td>&nbsp;&nbsp;&nbsp;</td>
-  <td>RetroShare MediaWiki</td>
+  <td>RetroShare Wiki</td>
   <td>
     <a href="http://retroshare.sourceforge.net/wiki">
      http://retroshare.sourceforge.net/wiki</a>