diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout.tpl
index 11e2c6802..b359dc73a 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout.tpl
@@ -9,7 +9,8 @@
 
 <body bgcolor="#00000000">
 
-<table width="100%" cellspacing="1"><tr><td bgcolor="#000000">
+<table width="100%" cellspacing="1">
+  <tr><td bgcolor="#000000">
 	<table width="100%">
 	<tr><td height="3"></td></tr>
 	<tr valign="middle">
@@ -18,54 +19,78 @@
 	<td width="50%"></td>
 	</tr>
 	<tr><td height="3"></td></tr>
-	</table></td></tr><tr><td>
-<table width="100%" cellspacing="2">
-	<tr><td height="20"></td><td></td></tr>
-	<tr>
-		<td width="2%"><img src="http://app.ryzom.com/app_forum//images/public_forum.png"></td>
-		<td width="100%" height="20" valign="middle"><h1>Forums</h1></td>
-		<td nowrap align="right">
-	<table width="100%">
-	<tr>
-	<td align="right">
-	<form method="post" action="http://app.ryzom.com/app_forum/index.php?page=forum&shardid=302&name=Quitta&lang=en&datasetid=90501&ig=1">
-		<select name="forum_group"><option value="3">Communaut.. de langue fran..aise</option><option value="2">Deutschsprachige Community
-		</option><option value="1" selected="selected">English, Espa..ol, ..............</option></select>
-		<input type="submit" value="Go">
-	</form>
-	</td>
+	</table>
+  </td></tr>
+  <tr><td>
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+	<tr bgcolor="#00000040" valign="middle">
+	  <td>
+	  <table>
+	    <tr>
+	      <td>
+		<table cellspacing="0" cellpadding="4">
+		  <tr>
+		    <td valign="middle" nowrap><a href="lol.html"><h7>Edit User</h7></a></td>
+		    <td valign="middle" nowrap><a href="lol.html"><h7>Send Ticket</h7></a></td>
+		    <td valign="middle" nowrap><a href="lol.html"><h7>Make Admin</h7></a></td>
+		    <td valign="middle" nowrap><a href="lol.html"><h7>Demote to User</h7></a></td>
+		  </tr>
+		</table>
+	      </td>
+	    </tr>
+	  </table>
+	  </td>
 	</tr>
-	</table></td>
+	<tr>
+		<td height="3" bgcolor="#000000"></td>
 	</tr>
+      </table>
+  </td></tr>
+  <tr><td>
+	<table width="100%" cellspacing="2">
+	<tr><td height="7"></td><td></td></tr>
+	<tr>
+		<td width="3%"></td>
+		<td width="100%" height="12" valign="middle"><h1>Forums</h1></td>
+	</tr>	
+	</table>
+  </td></tr>
+  <tr><td>
+      <table width="100%">
+	<tr>
+	  <td height="5"></td>
+	</tr>
+	<tr>
+		<td height="1" bgcolor="#000000"></td>
+	</tr>
+	<tr>
+		<td height="2"></td>
+	</tr>
+      </table>
+  </td></tr>
+    <tr><td>
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+	<tr bgcolor="#000000" valign="middle">
+	  <td>
+	    <table>
+	      <tr><td height="8"></td></tr>
+	    </table>
+	  </td>
+	</tr>
+	<tr bgcolor="#303030" valign="middle">
+	  <td>
+	    <table>
+	      <tr><td height="50"></td></tr>
+	    </table>
+	  </td>
+	</tr>
+      </table>
+      
+  </td></tr>
+    
+    
+
 </table>
-</td></tr><tr><td><table width="100%">
-<tr>
-	<td height="5"></td>
-</tr>
-<tr>
-	<td height="1" bgcolor="#000000"></td>
-</tr>
-<tr>
-	<td height="5"></td>
-</tr>
-</table>
-</td></tr><tr><td><table width="100%" cellspa
-cing="0" cellpadding="0" border="0">
-	<tr bgcolor="#000000" valign="middle"><td></td><td><table cellspacing="0" cellpadding="4"><tr><td><h5>Public</h5></td></tr></table></td><td nowrap align="right"></td><td align="center"><table cellspacing="0" cellpadding="4"><tr><td><h5>Topics</h5></td></tr></table></td><td align="center"><table cellspacing="0" cellpadding="4"><tr><td><h5>Posts</h5></td></tr></table></td><td><table cellspacing="0" cellpadding="4"><tr><td><h5>Last post</h5></td></tr></table></td></tr><tr valign="middle" bgcolor="#303030"><td height="34"><img src="http://app.ryzom.com/app_forum//images/public_forum.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/1839">Official News (arispotle) (<font color="#ff0000">1076</font>)</a></td><td nowrap align="right"></td><td width="5%" align="center">34</td><td width="5%" align="center">1244</td><td width="40%"><font color="#dd9922">Casy</font><br>4 days ago</td></tr><tr valign="middle" bgcolor="#3f3f3f"><td heig
-ht="34"><img src="http://app.ryzom.com/app_forum//images/public_forum.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/4">General (arispotle) (<font color="#ff0000">2564</font>)</a><br>Come in, pull up a chair, let&#039;s discuss all things Ryzom-related. Guests can post.</td><td nowrap align="right"></td><td width="5%" align="center">490</td><td width="5%" al
-ign="center">5115</td><td width="40%"><font color="#dd9922">Fyrosfreddy</font><br>21.3 hours ago</td></tr><tr valign="middle" bgcolor="#303030"><td height="34"><img src="http://app.ryzom.com/app_forum//images/public_forum.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/1841">Support (arispotle) (<font color="#ff0000">1240</font>)</a><br>Have a problem getting things to work? Drop us a line here and you&#039;ll find all the help you need. Guests can post.</td><td nowrap align="right"></td><td width="5%" align="center">315</td><td width="5%" align="center">2037</td><td width="40%"><font color="#dd9922">Fyrosfreddy</font><br>2 days ago</td></tr><tr valign="middle" bgcolor="#3f3f3f"><td height="34"><img src="http://app.ryzom.com/app_forum//images/public_forum.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/1840">Ideas For Ryzom (arispotle) (<font color="#ff0000">2478</font>)</a><br>Do you have an idea for Ryzom? 
-It&#039;s time to add it and see if other people think it&#039;s a good idea!</td><td nowrap align="right"></td><td width="5%" align="center">451</td><td width="5%" align="center">4403</td><td width="40%"><font color="#dd9922">Toak</font><br>22.7 hours ago</td></tr><tr valign="middle" bgcolor="#303030"><td height="34"><img src="http://app.ryzom.com/app_forum//images/public_forum.png" alt=""></td><td width="50
-%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/52">Web Apps Bugs, Comments, Notes, Etc (<font color="#ff0000">355</font>)</a><br>Only for Web Apps related things. In English please :-)</td><td nowrap align="right"></td><td width="5%" align="center">207</td><td width="5%" align="center">1230</td><td width="40%"><font color="#dd9922">Arfur</font><br>2 days ago</td></tr><tr valign="middle" bgcolor="#3f3f3f"><td height="34"><img src="http://app.ryzom.com/app_forum//images/public_forum.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/1847">.......................... .................... (arispotle) (<font color="#ff0000">101</font>)</a></td><td nowrap align="right"></td><td width="5%" align="center">18</td><td width="5%" align="center">110</td><td width="40%"><font color="#dd9922">Amedala</font><br>3 weeks ago</td></tr><tr valign="middle" bgcolor="#303030"><td height="34"><img src="http://app.ryzom.com/app_forum//images/public_forum.png" alt="
-"></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/1848">Espa..ol De La Comunidad (arispotle) (<font color="#ff0000">100</font>)</a></td><td nowrap align="right"></td><td width="5%" align="center">57</td><td width="5%" align="center">122</td><td width="40%"><font color="#ff0000">Kemen</font><br>4 days ago</td></tr><tr bgcolor="#000000" valign="middle"><td></td><td><table 
-cellspacing="0" cellpadding="4"><tr><td><h5>Role Play</h5></td></tr></table></td><td nowrap align="right"></td><td align="center"><table cellspacing="0" cellpadding="4"><tr><td><h5>Topics</h5></td></tr></table></td><td align="center"><table cellspacing="0" cellpadding="4"><tr><td><h5>Posts</h5></td></tr></table></td><td><table cellspacing="0" cellpadding="4"><tr><td><h5>Last post</h5></td></tr></table></td></tr><tr valign="middle" bgcolor="#3f3f3f"><td height="34"><img src="http://app.ryzom.com/app_forum//images/public_forum.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/1842">Events (arispotle) (<font color="#ff0000">363</font>)</a><br>Dates and Venues of Future Events</td><td nowrap align="right"></td><td width="5%" align="center">58</td><td width="5%" align="center">523</td><td width="40%"><font color="#dd9922">Rollocks</font><br>3.7 hours ago</td></tr><tr valign="middle" bgcolor="#303030"><td height="34"><img src="http://app.ryzom.com/app_forum//images/p
-ublic_forum.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/2147">Events (OOC) (arispotle) (<font color="#ff0000">271</font>)</a><br>Discussion of events and roleplay (OOC only)</td><td nowrap align="right"></td><td width="5%" align="center">53</td><td width="5%" align="center">569</td><td width="40%"><font color="#dd9922">Feylin</font><br>1 week ago</td></tr
-><tr valign="middle" bgcolor="#3f3f3f"><td height="34"><img src="http://app.ryzom.com/app_forum//images/public_forum.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/539">Roleplay (arispotle) (<font color="#ff0000">768</font>)</a><br>Roleplay forum for every civilisations and factions</td><td nowrap align="right"></td><td width="5%" align="center">186</td><td width="5%" align="center">1564</td><td width="40%"><font color="#dd9922">Zhoi</font><br>8.7 hours ago</td></tr><tr valign="middle" bgcolor="#303030"><td height="34"><img src="http://app.ryzom.com/app_forum//images/public_forum.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/215">Bazaar (arispotle) (<font color="#ff0000">124</font>)</a><br>Something to buy or to sell?</td><td nowrap align="right"></td><td width="5%" align="center">102</td><td width="5%" align="center">366</td><td width="40%"><font color="#dd9922">Chanchey</font><br>1 month ago</td></tr><tr
- valign="middle" bgcolor="#3f3f3f"><td height="34"><img src="http://app.ryzom.com/app_forum//images/public_forum.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/214">Guild Registry (arispotle) (<font color="#ff0000">798</font>)</a><br>Public guild registry and presentation</td><td nowrap align="right"></td><td width="5%" align="center">112</td><td width="5%" 
-align="center">1048</td><td width="40%"><font color="#dd9922">Astarth</font><br>2 days ago</td></tr><tr bgcolor="#000000" valign="middle"><td></td><td><table cellspacing="0" cellpadding="4"><tr><td><h5>Faction</h5></td></tr></table></td><td nowrap align="right"></td><td align="center"><table cellspacing="0" cellpadding="4"><tr><td><h5>Topics</h5></td></tr></table></td><td align="center"><table cellspacing="0" cellpadding="4"><tr><td><h5>Posts</h5></td></tr></table></td><td><table cellspacing="0" cellpadding="4"><tr><td><h5>Last post</h5></td></tr></table></td></tr><tr valign="middle" bgcolor="#303030"><td height="34"><img src="http://app.ryzom.com/app_forum//images/atys-32x32.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/66">Faction-neutrals (arispotle) (<font color="#ff0000">9</font>)</a></td><td nowrap align="right"></td><td width="5%" align="center">6</td><td width="5%" align="center">36</td><td width="40%"><font color="#dd9922">Quittaftwin</font><br>11 
-hours ago</td></tr><tr bgcolor="#000000" valign="middle"><td></td><td><table cellspacing="0" cellpadding="4"><tr><td><h5>Civilization</h5></td></tr></table></td><td nowrap align="right"></td><td align="center"><table cellspacing="0" cellpadding="4"><tr><td><h5>Topics</h5></td></tr></table></td><td align="center"><table cellspacing="0" cellpadding="4"><tr><td><h5>Posts</h5></td></tr></table></td><td><table cel
-lspacing="0" cellpadding="4"><tr><td><h5>Last post</h5></td></tr></table></td></tr><tr valign="middle" bgcolor="#303030"><td height="34"><img src="http://app.ryzom.com/app_forum//images/atys-32x32.png" alt=""></td><td width="50%"><a href="http://app.ryzom.com/app_forum/index.php?page=forum/view/56">Civilization-neutrals (arispotle) (<font color="#ff0000">44</font>)</a></td><td nowrap align="right"></td><td width="5%" align="center">9</td><td width="5%" align="center">175</td><td width="40%"><font color="#dd9922">Irfidel</font><br>1 week ago</td></tr></table>
-</td></tr><tr><td><table cellpadding="3" border="0" valign="middle" bgcolor="#000000" width="100%"><tr><td height="15" valign="middle">Last visit <i>date#70/01/01</i> 00:00</td>
-</tr></table></td></tr></table>
 
 
 
diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl
index 02dc62730..2a4076954 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl
@@ -1,14 +1,14 @@
 {extends file="layout.tpl"}
 {block name=menu}
-	<td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></td>
-        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=show_user"><i class="icon-user"></i><span class="hidden-tablet"> Profile</span></a></td>
-        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=settings"><i class="icon-cog"></i><span class="hidden-tablet"> Settings</span></a></td>
+	<td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php"><h5> Dashboard</h5></a></td>
+        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=show_user"><h5> Profile</h5></a></td>
+        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=settings"><h5> Settings</h5></a></td>
         <td width="10" align="center">|</td>
-        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=userlist"><i class="icon-th-list"></i><span class="hidden-tablet"> Users</span></a></td>
-        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=show_queue&get=todo"><i class="icon-th-list"></i><span class="hidden-tablet"> Queues</span></a></td>
-        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=sgroup_list"><i class="icon-briefcase"></i><span class="hidden-tablet"> Support Groups</span></a></td>
+        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=userlist"><h5> Users</h5></a></td>
+        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=show_queue&get=todo"><h5> Queues</h5></a></td>
+        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=sgroup_list"><h5> Support Groups</h5></a></td>
         <td width="10" align="center">|</td>
-        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=libuserlist"><i class="icon-th-list"></i><span class="hidden-tablet"> Syncing</span></a></td>
-        <td height="25" valign="middle" nowrap><a href="?page=logout"><i class="icon-off"></i><span class="hidden-tablet"> Logout </span></a></td>
+        <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=libuserlist"><h5> Syncing</h5></a></td>
+        <td height="25" valign="middle" nowrap><a href="?page=logout"><h5> Logout </h5></a></td>
 {/block}
 
