diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/home.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/home.tpl
index 4f1851563..98b83958e 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/home.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/home.tpl
@@ -1,12 +1,54 @@
 {block name=content}
-
-
+  <tr><td>
+	<table width="100%" bgcolor="#303030" cellspacing="2">
+	<tr><td height="7"></td><td></td></tr>
+	<tr>
+		<td width="3%"></td>
+		<td width="100%" height="12" valign="middle"><h1>{$home_title}</h1></td>
+	</tr>
+	<tr>
+	  <td height="5"></td><td></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><td height="2"></td></tr>
+	<tr><td height="1" bgcolor="#000000"></td></tr>
+	<tr><td height="10"></td></tr>
+	<tr valign="middle">
+	  <td>
+	    <table width="100%" height="100%" cellpadding="10">
+	      <tr><td>
+		<table width="100%" bgcolor="#00000030" border="2">
+			<tr><td>
+				<table cellpadding="10">
+					<tr><td>
+						<p><h3>{$home_info}</h3></p>
+					</td></tr>
+				</table>
+			</td></tr>
+		</table>
+	      </td></tr>
+	    </table>
+	  </td>
+	</tr>
+      </table>
+      
+  </td></tr>
 
 	
 
-				<h2><i class="icon-info-sign"></i> {$home_title}</h2>
+				
 			
-				<p><strong>{$home_info}</strong></p>
+				
 	
 {/block}
 
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 b359dc73a..c98768e52 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
@@ -11,7 +11,7 @@
 
 <table width="100%" cellspacing="1">
   <tr><td bgcolor="#000000">
-	<table width="100%">
+	<table width="100%" cellspacing="2">
 	<tr><td height="3"></td></tr>
 	<tr valign="middle">
 	<td width="3"></td>
@@ -21,72 +21,7 @@
 	<tr><td height="3"></td></tr>
 	</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>
-	<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>
+  {block name=content}{/block}
     
     
 
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 2a4076954..fb6529b9b 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,24 @@
 {extends file="layout.tpl"}
 {block name=menu}
 	<td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php"><h5> Dashboard</h5></a></td>
+        <td width="3"></td>
         <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=show_user"><h5> Profile</h5></a></td>
+         <td width="3"></td>
         <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=settings"><h5> Settings</h5></a></td>
+         <td width="3"></td>
         <td width="10" align="center">|</td>
+         <td width="3"></td>
         <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=userlist"><h5> Users</h5></a></td>
+         <td width="3"></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 width="3"></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="3"></td>
         <td width="10" align="center">|</td>
+         <td width="3"></td>
         <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=libuserlist"><h5> Syncing</h5></a></td>
+         <td width="3"></td>
         <td height="25" valign="middle" nowrap><a href="?page=logout"><h5> Logout </h5></a></td>
+         <td width="3"></td>
 {/block}