diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua
index baca461b0..d6ac2e94c 100644
--- a/MCServer/webadmin/template.lua
+++ b/MCServer/webadmin/template.lua
@@ -82,9 +82,11 @@ function ShowPage(WebAdmin, TemplateRequest)
 <div class="upper">
 <div class="wrapper">
 <ul class="menu top_links">
-<li><a href=".././"><img src="/log_out.png" style="vertical-align:bottom;"> Log Out</a></li>
+<li><a>Server Name: <strong>]] .. cRoot:Get():GetServer():GetServerID() .. [[</strong></a></li>
+<li><a>Memory: <strong>]] .. MemoryUsageKiB / 1024 .. [[MB</strong></a></li>
+<li><a>Chunks: <strong>]] .. NumChunks .. [[</strong></a></li>
 </ul>
-<div class="welcome"><strong>Welcome back, ]] .. TemplateRequest.Request.Username .. [[</strong></div>
+<div class="welcome"><strong>Welcome back, ]] .. TemplateRequest.Request.Username .. [[</strong>&nbsp;&nbsp;&nbsp;<a href=".././"><img src="/log_out.png" style="vertical-align:bottom;"> Log Out</a></div>
 </div>
 </div>
 </div>
@@ -101,7 +103,7 @@ function ShowPage(WebAdmin, TemplateRequest)
 <tr>
 <td class="trow1 smalltext"><a href=']] .. BaseURL .. [[' class='usercp_nav_item usercp_nav_home'>Home</a></td>
 </tr>
-<tr><td class="tcat"><div><span class="smalltext"><strong>Server Management</strong></span></div></td></tr></tbody><tbody style="" id="usercppms_e"><tr><td class="trow1 smalltext">
+<tr><td class="tcat"><div><span class="smalltext"><strong><font color="#000">Server Management</font></strong></span></div></td></tr></tbody><tbody style="" id="usercppms_e"><tr><td class="trow1 smalltext">
 	]])
 
 
@@ -145,9 +147,11 @@ function ShowPage(WebAdmin, TemplateRequest)
 <div class="upper">
 <div class="wrapper">
 <ul class="menu bottom_links">
-<li><a>Server Name: <strong>]] .. cRoot:Get():GetServer():GetServerID() .. [[</strong></a></li>
-<li><a>Memory: <strong>]] .. MemoryUsageKiB / 1024 .. [[MB</strong></a></li>
-<li><a>Chunks: <strong>]] .. NumChunks .. [[</strong></a></li>
+<li><a href=http://www.mc-server.org target=_blank>MCServer</a></li>
+<li><a href=http://forum.mc-server.org target=_blank>Forums</a></li>
+<li><a href=http://builds.cuberite.org target=_blank>Buildserver</a></li>
+<li><a href=http://mc-server.xoft.cz/LuaAPI target=_blank>API Documentation</a></li>
+<li><a href=http://book.mc-server.org/ target=_blank>User's Manual</a></li>
 </ul>
 </div>
 </div>