All pastes #11998 Raw Edit

Untitled

public text v1 · immutable
#11998 ·published 2005-05-17 17:54 UTC
rendered paste body
Index: java/net/sf/l2j/gameserver/Announcements.java
===================================================================
--- C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/Announcements.java	(revision 47)
+++ C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/Announcements.java	(working copy)
@@ -122,21 +122,26 @@
 	{		
 		NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
 		
-		StringBuffer replyMSG = new StringBuffer("<html><title>Announcements:</title>");
-		replyMSG.append("<body>");
+		StringBuffer replyMSG = new StringBuffer("<html><body>");
+		replyMSG.append("<table width=260><tr>");
+		replyMSG.append("<td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td width=180><center>Announcement Menu</center></td>");
+		replyMSG.append("<td width=40><button value=\"Back\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("</tr></table>");
+		replyMSG.append("<br><br>");
+		replyMSG.append("<center>Add or announce a new announcement:</center>");
+		replyMSG.append("<center><multiedit var=\"new_announcement\" width=240 height=30></center><br>");
+		replyMSG.append("<center><table><tr><td>");
+		replyMSG.append("<button value=\"Add\" action=\"bypass -h admin_add_announcement $new_announcement\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td>");
+		replyMSG.append("<button value=\"Announce\" action=\"bypass -h admin_announce_menu $new_announcement\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td>");
+		replyMSG.append("<button value=\"Reload\" action=\"bypass -h admin_announce_announcements\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("</td></tr></table></center>");
+		replyMSG.append("<br>");
 		for (int i = 0; i < _announcements.size(); i++)
 		{
-			replyMSG.append(_announcements.get(i).toString());
-			replyMSG.append("<center><button value=\"Delete\" action=\"bypass -h admin_del_announcement " + i + "\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
+			replyMSG.append("<table width=260><tr><td width=220>" + _announcements.get(i).toString() + "</td><td width=40>");
+			replyMSG.append("<button value=\"Delete\" action=\"bypass -h admin_del_announcement " + i + "\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr></table>");
 		}
-		replyMSG.append("<br>");
-		replyMSG.append("Add a new announcement:");
-		replyMSG.append("<center><multiedit var=\"add_announcement\" width=240 height=60></center><br>");
-		replyMSG.append("<center><button value=\"Add\" action=\"bypass -h admin_add_announcement $add_announcement\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<center><button value=\"Reload\" action=\"bypass -h admin_reload_announcements\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<center><button value=\"Announce\" action=\"bypass -h admin_announce_announcements\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<br>");
-		replyMSG.append("<button value=\"Back\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
 		replyMSG.append("</body></html>");
 		
 		adminReply.setHtml(replyMSG.toString());
Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java
===================================================================
--- C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java	(revision 47)
+++ C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java	(working copy)
@@ -21,7 +21,6 @@
 import net.sf.l2j.Config;
 import net.sf.l2j.gameserver.handler.IAdminCommandHandler;
 import net.sf.l2j.gameserver.model.L2PcInstance;
-import net.sf.l2j.gameserver.model.L2World;
 import net.sf.l2j.gameserver.serverpackets.NpcHtmlMessage;
 
 /**
@@ -53,23 +52,32 @@
 	{
 		NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
 		
-		StringBuffer replyMSG = new StringBuffer("<html><title>Server Status</title>");
-		replyMSG.append("<body>");
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>Players Online: " + L2World.getInstance().getAllPlayers().size() + "</td></tr>");				
-		replyMSG.append("<tr><td>Used Memory: " + (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
-		replyMSG.append(" bytes</td></tr>");
-		replyMSG.append("</table>");		
+		StringBuffer replyMSG = new StringBuffer("<html><body>");
+		replyMSG.append("<center>Server Status</center><br>");
+		replyMSG.append("<center><table width=200><tr><td>");
+		replyMSG.append("<button value=\"Help & Info\" action=\"bypass -h admin_help admhelp.htm\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("<button value=\"Character List\" action=\"bypass -h admin_show_characters 0\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("<button value=\"Manage Server\" action=\"bypass -h admin_server_shutdown\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");	
+		replyMSG.append("<button value=\"Announcements\" action=\"bypass -h admin_list_announcements\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
 		replyMSG.append("<br>");
-		replyMSG.append("<center><button value=\"Help\" action=\"bypass -h admin_help admhelp.htm\" width=100 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		replyMSG.append("<button value=\"Shutdown Server\" action=\"bypass -h admin_server_shutdown\" width=100 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");	
-		replyMSG.append("<button value=\"List Characters\" action=\"bypass -h admin_show_characters 0\" width=100 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		replyMSG.append("<button value=\"Move to Location\" action=\"bypass -h admin_show_moves\" width=100 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		replyMSG.append("<button value=\"Spawn a Monster\" action=\"bypass -h admin_show_spawns\" width=100 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		replyMSG.append("<button value=\"Item Creation\" action=\"bypass -h admin_itemcreate\" width=100 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		replyMSG.append("<button value=\"GM Shops\" action=\"bypass -h admin_gmshop\" width=100 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		replyMSG.append("<button value=\"Announcements\" action=\"bypass -h admin_list_announcements\" width=100 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<br><br>");
+		replyMSG.append("<button value=\"Fly Wyvern\" action=\"bypass -h admin_ride_wyvern\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("<button value=\"Land Wyvern\" action=\"bypass -h admin_unride_wyvern\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("</td><td>");
+		replyMSG.append("<button value=\"GM Shop\" action=\"bypass -h admin_gmshop\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("<button value=\"Npc Spawn\" action=\"bypass -h admin_show_spawns\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("<button value=\"Create Item\" action=\"bypass -h admin_itemcreate\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("<button value=\"Teleport Menu\" action=\"bypass -h admin_show_moves\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("<br>");
+		replyMSG.append("<br>");
+		replyMSG.append("<br>");
+		replyMSG.append("</td></tr></table></center><br>");
+		replyMSG.append("<center>Character name:</center>");
+		replyMSG.append("<center><edit var=\"menu_command\" width=100 height=15></center><br>");
+		replyMSG.append("<center><table><tr><td>");
+		replyMSG.append("<button value=\"Kill\" action=\"bypass -h admin_kill $menu_command\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td>");
+		replyMSG.append("<button value=\"Kick\" action=\"bypass -h admin_kick $menu_command\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td>");
+		replyMSG.append("<button value=\"Ban\" action=\"bypass -h admin_ban $menu_command\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("</td></tr></table></center><br>");
 		replyMSG.append("<tr><td>Server Software: Server software running L2J version 0.5 nightly created by L2Chef and the L2J team.</td></tr>");
 		replyMSG.append("</body></html>");
 		
Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminExpSp.java
===================================================================
--- C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminExpSp.java	(revision 47)
+++ C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminExpSp.java	(working copy)
@@ -92,20 +92,26 @@
 		
 		NpcHtmlMessage adminReply = new NpcHtmlMessage(5);		
 
-		StringBuffer replyMSG = new StringBuffer("<html><title>Add Exp-Sp to " + player.getName() + "</title>");
-		replyMSG.append("<body>");
-		replyMSG.append("<br>");
-		replyMSG.append("<center>Lv: " + player.getLevel() + " " + player.getTemplate().className + "<p>");
-		replyMSG.append("Exp: " + player.getExp() + "<p>");
-		replyMSG.append("Sp: " + player.getSp() + "<p>");
-		replyMSG.append("</center><br>");
-		replyMSG.append("<center>Caution ! Dont forget that modifying players stats can ruin the game...</center><br>");
-		replyMSG.append("Exp: ");
-		replyMSG.append("<edit var=\"exp_to_add\" width=110>");
-		replyMSG.append("Sp: ");
-		replyMSG.append("<edit var=\"sp_to_add\" width=110>");
-		replyMSG.append("<button value=\"Add Exp-Sp\" action=\"bypass -h admin_add_exp_sp $exp_to_add $sp_to_add\" width=110 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-		replyMSG.append("<br><center><button value=\"Back\" action=\"bypass -h admin_current_player\" width=40 height=15></center>");
+		StringBuffer replyMSG = new StringBuffer("<html><body>");
+		replyMSG.append("<table width=260><tr>");
+		replyMSG.append("<td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td width=180><center>Character Selection Menu</center></td>");
+		replyMSG.append("<td width=40><button value=\"Back\" action=\"bypass -h admin_current_player\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("</tr></table>");
+		replyMSG.append("<br><br>");
+		replyMSG.append("<table width=270><tr><td>Name: " + player.getName() + "</td></tr>");
+		replyMSG.append("<tr><td>Lv: " + player.getLevel() + " " + player.getTemplate().className + "</td></tr>");
+		replyMSG.append("<tr><td>Exp: " + player.getExp() + "</td></tr>");
+		replyMSG.append("<tr><td>Sp: " + player.getSp() + "</td></tr></table>");
+		replyMSG.append("<br><table width=270><tr><td>Note: Dont forget that modifying players skills can</td></tr>");
+		replyMSG.append("<tr><td>ruin the game...</td></tr></table><br>");
+		replyMSG.append("<table width=270><tr><td>Note: Fill all values before saving the modifications.,</td></tr>");
+		replyMSG.append("<tr><td>Note: Use 0 if no changes are needed.</td></tr></table><br>");
+		replyMSG.append("<center><table><tr>");
+		replyMSG.append("<td>Exp: <edit var=\"exp_to_add\" width=50></td>");
+		replyMSG.append("<td>Sp:  <edit var=\"sp_to_add\" width=50></td>");
+		replyMSG.append("<td>&nbsp;<button value=\"Save Changes\" action=\"bypass -h admin_add_exp_sp $exp_to_add $sp_to_add\" width=80 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("</tr></table></center>");
 		replyMSG.append("</body></html>");
 		
 		adminReply.setHtml(replyMSG.toString());
Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShutdown.java
===================================================================
--- C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShutdown.java	(revision 47)
+++ C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShutdown.java	(working copy)
@@ -18,12 +18,16 @@
  */
 package net.sf.l2j.gameserver.handler.admincommandhandlers;
 
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.logging.Logger;
 
 import net.sf.l2j.Config;
+import net.sf.l2j.gameserver.GameTimeController;
 import net.sf.l2j.gameserver.Shutdown;
 import net.sf.l2j.gameserver.handler.IAdminCommandHandler;
 import net.sf.l2j.gameserver.model.L2PcInstance;
+import net.sf.l2j.gameserver.model.L2World;
 import net.sf.l2j.gameserver.serverpackets.NpcHtmlMessage;
 
 
@@ -83,21 +87,37 @@
 	private void sendHtmlForm(L2PcInstance activeChar) {
 		NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
 		
-		StringBuffer replyMSG = new StringBuffer("<html><title>Shutdown Server</title>");
-		replyMSG.append("<body><br>");
-
-		replyMSG.append("Enter in seconds the time till the server shutdowns bellow:<br>");
-		replyMSG.append("<table><tr><td>");
-		replyMSG.append("Seconds till: <edit var=\"shutdown_time\" width=60>");
-		replyMSG.append("</td></tr></table>");
-		replyMSG.append("<br>");
+		int t = GameTimeController.getInstance().getGameTime();
+		int h = t/60;
+		int m = t%60;
+		SimpleDateFormat format = new SimpleDateFormat("h:mm a");
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY, h);
+		cal.set(Calendar.MINUTE, m);
 		
-		replyMSG.append("<center><button value=\"Shutdown\" action=\"bypass -h admin_server_shutdown $shutdown_time\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");			
-		replyMSG.append("<center><button value=\"Restart\" action=\"bypass -h admin_server_restart $shutdown_time\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");			
-		replyMSG.append("<center><button value=\"Abort\" action=\"bypass -h admin_server_abort\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");		
+		StringBuffer replyMSG = new StringBuffer("<html><body>");
+		replyMSG.append("<table width=260><tr>");
+		replyMSG.append("<td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td width=180><center>Server Management Menu</center></td>");
+		replyMSG.append("<td width=40><button value=\"Back\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("</tr></table>");
+		replyMSG.append("<br><br>");
+		replyMSG.append("<table>");	
+		replyMSG.append("<tr><td>Players Online: " + L2World.getInstance().getAllPlayers().size() + "</td></tr>");				
+		replyMSG.append("<tr><td>Used Memory: " + (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) + " bytes</td></tr>");
+		replyMSG.append("<tr><td>Server Rates: " + Config.RATE_XP + "x, " + Config.RATE_SP + "x, " + Config.RATE_DROP_ADENA + "x, " + Config.RATE_DROP_ITEMS + "x</td></tr>");
+		replyMSG.append("<tr><td>Game Time: " + format.format(cal.getTime()) + "</td></tr>");
+		replyMSG.append("</table><br>");		
+		replyMSG.append("<table width=270>");
+		replyMSG.append("<tr><td>Enter in seconds the time till the server shutdowns bellow:</td></tr>");
 		replyMSG.append("<br>");
-
-		replyMSG.append("<center><button value=\"Back\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");		
+		replyMSG.append("<tr><td><center>Seconds till: <edit var=\"shutdown_time\" width=60></center></td></tr>");
+		replyMSG.append("</table><br>");
+		replyMSG.append("<center><table><tr><td>");
+		replyMSG.append("<button value=\"Shutdown\" action=\"bypass -h admin_server_shutdown $shutdown_time\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td>");			
+		replyMSG.append("<button value=\"Restart\" action=\"bypass -h admin_server_restart $shutdown_time\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td><td>");			
+		replyMSG.append("<button value=\"Abort\" action=\"bypass -h admin_server_abort\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("</td></tr></table></center>");		
 		replyMSG.append("</body></html>");
 			
 		adminReply.setHtml(replyMSG.toString());
Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAnnouncements.java
===================================================================
--- C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAnnouncements.java	(revision 47)
+++ C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAnnouncements.java	(working copy)
@@ -43,7 +43,8 @@
 			"admin_announce_announcements",
 			"admin_add_announcement",
 			"admin_del_announcement",
-			"admin_announce"
+			"admin_announce",
+			"admin_announce_menu"
 			};
 	private static final int REQUIRED_LEVEL = Config.GM_ANNOUNCE;
 
@@ -59,6 +60,12 @@
 			Announcements.getInstance().loadAnnouncements();
 			Announcements.getInstance().listAnnouncements(activeChar);
 		} 
+		else if (command.startsWith("admin_announce_menu"))
+		{
+			Announcements sys = new Announcements();
+			sys.handleAnnounce(command, activeChar, 20);
+			Announcements.getInstance().listAnnouncements(activeChar);	
+		}
 		else if (command.equals("admin_announce_announcements"))
 		{
 			for (L2PcInstance player : L2World.getInstance().getAllPlayers())
Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSkill.java
===================================================================
--- C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSkill.java	(revision 47)
+++ C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSkill.java	(working copy)
@@ -147,18 +147,23 @@
 		L2Skill[] skills = player.getAllSkills();
 				
 		NpcHtmlMessage adminReply = new NpcHtmlMessage(5);		
-		StringBuffer replyMSG = new StringBuffer("<html><title>Remove skills of " + player.getName() + "</title>");
-		replyMSG.append("<body>");
-		replyMSG.append("<br>");
-		replyMSG.append("<center>Lv: " + player.getLevel() + " " + player.getTemplate().className + "<p>");
-		replyMSG.append("</center><br>");
-		replyMSG.append("<center>Caution ! Dont forget that modifying players skills can ruin the game...</center><br>");
-		replyMSG.append("<center>Click on the skill you wish to remove:</center>");
-		replyMSG.append("<center><table>");
-		replyMSG.append("<tr><td><center>Name:</center></td><td></td><td>Lvl:</td><td></td><td>Id:</td></tr>");
+		StringBuffer replyMSG = new StringBuffer("<html><body>");
+		replyMSG.append("<table width=260><tr>");
+		replyMSG.append("<td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td width=180><center>Character Selection Menu</center></td>");
+		replyMSG.append("<td width=40><button value=\"Back\" action=\"bypass -h admin_show_skills\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("</tr></table>");
+		replyMSG.append("<br><br>");
+		replyMSG.append("<center>Editing character: " + player.getName() + "</center>");
+		replyMSG.append("<br><table width=270><tr><td>Lv: " + player.getLevel() + " " + player.getTemplate().className + "</td></tr></table>");
+		replyMSG.append("<br><table width=270><tr><td>Note: Dont forget that modifying players skills can</td></tr>");
+		replyMSG.append("<tr><td>ruin the game...</td></tr></table>");
+		replyMSG.append("<br><center>Click on the skill you wish to remove:</center>");
+		replyMSG.append("<br><table width=270>");		
+		replyMSG.append("<tr><td width=80>Name:</td><td width=60>Level:</td><td width=40>Id:</td></tr>");
 		for (int i=0;i<skills.length;i++)
 		{
-			replyMSG.append("<tr><td><a action=\"bypass -h admin_remove_skill "+skills[i].getId()+"\">"+skills[i].getName()+"</a></td><td></td><td>"+skills[i].getLevel()+"</td><td></td><td>"+skills[i].getId()+"</td></tr>");
+			replyMSG.append("<tr><td width=80><a action=\"bypass -h admin_remove_skill "+skills[i].getId()+"\">"+skills[i].getName()+"</a></td><td width=60>"+skills[i].getLevel()+"</td><td width=40>"+skills[i].getId()+"</td></tr>");
 		}
 		replyMSG.append("</table></center>");
 		replyMSG.append("<br><center><table>");
@@ -168,7 +173,7 @@
 		replyMSG.append("</table></center>");		
 		replyMSG.append("<center><button value=\"Remove skill\" action=\"bypass -h admin_remove_skill $id_to_remove\" width=110 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
 		replyMSG.append("<br><center><button value=\"Back\" action=\"bypass -h admin_current_player\" width=40 height=15></center>");
-		replyMSG.append("</body></html>");
+		replyMSG.append("</table></body></html>");
 		
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
@@ -190,19 +195,23 @@
 		
 		NpcHtmlMessage adminReply = new NpcHtmlMessage(5);		
 
-		StringBuffer replyMSG = new StringBuffer("<html><title>Modify skills of " + player.getName() + "</title>");
-		replyMSG.append("<body>");
-		replyMSG.append("<br>");
-		replyMSG.append("<center>Lv: " + player.getLevel() + " " + player.getTemplate().className + "<p>");
-		replyMSG.append("</center><br>");
-		replyMSG.append("<center>Caution ! Dont forget that modifying players skills can ruin the game...</center><br>");
-		replyMSG.append("<center><table>");
-		replyMSG.append("<tr><td><button value=\"Add skills\" action=\"bypass -h admin_skill_list\" width=110 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td><button value=\"Remove skills\" action=\"bypass -h admin_remove_skills\" width=110 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr>");			
-		replyMSG.append("<tr><td><button value=\"Get skills\" action=\"bypass -h admin_get_skills\" width=110 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
-		replyMSG.append("<td><button value=\"Reset skills\" action=\"bypass -h admin_reset_skills\" width=110 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr>");
+		StringBuffer replyMSG = new StringBuffer("<html><body>");
+		replyMSG.append("<table width=260><tr>");
+		replyMSG.append("<td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td width=180><center>Character Selection Menu</center></td>");
+		replyMSG.append("<td width=40><button value=\"Back\" action=\"bypass -h admin_current_player\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("</tr></table>");
+		replyMSG.append("<br><br>");
+		replyMSG.append("<center>Editing character: " + player.getName() + "</center>");
+		replyMSG.append("<br><table width=270><tr><td>Lv: " + player.getLevel() + " " + player.getTemplate().className + "</td></tr></table>");
+		replyMSG.append("<br><table width=270><tr><td>Note: Dont forget that modifying players skills can</td></tr>");
+		replyMSG.append("<tr><td>ruin the game...</td></tr></table>");
+		replyMSG.append("<br><center><table>");
+		replyMSG.append("<tr><td><button value=\"Add skills\" action=\"bypass -h admin_skill_list\" width=70 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td><button value=\"Get skills\" action=\"bypass -h admin_get_skills\" width=70 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr>");			
+		replyMSG.append("<tr><td><button value=\"Delete skills\" action=\"bypass -h admin_remove_skills\" width=70 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td><button value=\"Reset skills\" action=\"bypass -h admin_reset_skills\" width=70 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr>");
 		replyMSG.append("</table></center>");		
-		replyMSG.append("<br><center><button value=\"Back\" action=\"bypass -h admin_current_player\" width=40 height=15></center>");
 		replyMSG.append("</body></html>");
 		
 		adminReply.setHtml(replyMSG.toString());
Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKick.java
===================================================================
--- C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKick.java	(revision 47)
+++ C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKick.java	(working copy)
@@ -5,6 +5,7 @@
 
 import net.sf.l2j.Config;
 import net.sf.l2j.gameserver.handler.IAdminCommandHandler;
+import net.sf.l2j.gameserver.serverpackets.SystemMessage;
 import net.sf.l2j.gameserver.model.L2PcInstance;
 import net.sf.l2j.gameserver.model.L2World;
 
@@ -37,6 +38,9 @@
                     //System.out.println("Player2 "+plyr.getName());
                     plyr.logout();
                 }
+				SystemMessage sm = new SystemMessage(614);
+				sm.addString("You kicked " + plyr.getName() + " from the game.");
+				activeChar.sendPacket(sm);
             }
         }
         return true;
Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCreateItem.java
===================================================================
--- C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCreateItem.java	(revision 47)
+++ C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCreateItem.java	(working copy)
@@ -112,13 +112,19 @@
 		activeChar.sendPacket(il);
 		
 		SystemMessage sm = new SystemMessage(614);
-		sm.addString("You have spawned "+num+ " item(s) number " + id + " in your inventory.");
+		sm.addString("You have spawned " + num + " item(s) number " + id + " in your inventory.");
 		activeChar.sendPacket(sm);
 				
 		NpcHtmlMessage adminReply = new NpcHtmlMessage(5);		
-		StringBuffer replyMSG = new StringBuffer("<html><title>Item Creation Complete(I Hope)</title>");
-		replyMSG.append("<body>");
-		replyMSG.append("<center><button value=\"Back\" action=\"bypass -h admin_admin\" width=40 height=15></center>");
+		StringBuffer replyMSG = new StringBuffer("<html><body>");
+		replyMSG.append("<table width=260><tr>");
+		replyMSG.append("<td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td width=180><center>Item Creation Menu</center></td>");
+		replyMSG.append("<td width=40><button value=\"Back\" action=\"bypass -h admin_help itemcreation.htm\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("</tr></table>");
+		replyMSG.append("<br><br>");
+		replyMSG.append("<table width=270><tr><td>Item Creation Complete.<br></td></tr></table>");
+		replyMSG.append("<table width=270><tr><td>You have spawned " + num + " item(s) number " + id + " in your inventory.</td></tr></table>");
 		replyMSG.append("</body></html>");
 		
 		adminReply.setHtml(replyMSG.toString());
Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEditChar.java
===================================================================
--- C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEditChar.java	(revision 47)
+++ C:/Documents and Settings/Robert-Jan/Bureaublad/Eclipse/workspace/Server/L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEditChar.java	(working copy)
@@ -161,28 +161,36 @@
 		
 		NpcHtmlMessage adminReply = new NpcHtmlMessage(5);		
 
-		StringBuffer replyMSG = new StringBuffer("<html><title>Characters List</title>");
-		replyMSG.append("<body>");
+		StringBuffer replyMSG = new StringBuffer("<html><body>");
+		replyMSG.append("<table width=260><tr>");
+		replyMSG.append("<td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td width=180><center>Character Selection Menu</center></td>");
+		replyMSG.append("<td width=40><button value=\"Back\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("</tr></table>");
+		replyMSG.append("<br><br>");
+		replyMSG.append("<table width=270>");
+		replyMSG.append("<tr><td width=270>You can find a character by writing his name and</td></tr>");
+		replyMSG.append("<tr><td width=270>clicking Find bellow.<br></td></tr>");
+		replyMSG.append("<tr><td width=270>Note: Names should be written case sensitive.</td></tr>");
+		replyMSG.append("</table><br>");
+		replyMSG.append("<center><table><tr><td>");
+		replyMSG.append("<edit var=\"character_name\" width=80></td><td><button value=\"Find\" action=\"bypass -h admin_find_character $character_name\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+		replyMSG.append("</td></tr></table></center><br><br>");
 		
 		for (int x=0; x<MaxPages; x++)
 		{
-			replyMSG.append("<a action=\"bypass -h admin_show_characters " + x + "\">Page" + x+1 + "</a>\t");	
+			replyMSG.append("<center><a action=\"bypass -h admin_show_characters " + x + "\">Page " + x+1 + "</a></center>");	
 		}			
 		replyMSG.append("<br>");
 
 		//List Players in a Table
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>Name</td><td>Class</td><td>Level</td></tr>");
+		replyMSG.append("<table width=270>");		
+		replyMSG.append("<tr><td width=80>Name:</td><td width=110>Class:</td><td width=40>Level:</td></tr>");
 		for (int i = CharactersStart; i < CharactersEnd; i++)
 		{	//Add player info into new Table row
-			replyMSG.append("<tr><td>" + "<a action=\"bypass -h admin_character_list " + players[i].getName() + "\">" + players[i].getName() + "</a>" + "</td><td>" + players[i].getTemplate().className + "</td><td>" + players[i].getLevel() + "</td></tr>");
+			replyMSG.append("<tr><td width=80>" + "<a action=\"bypass -h admin_character_list " + players[i].getName() + "\">" + players[i].getName() + "</a></td><td width=110>" + players[i].getTemplate().className + "</td><td width=40>" + players[i].getLevel() + "</td></tr>");
 		}
 		replyMSG.append("</table>");
-		replyMSG.append("---------<p>");
-		replyMSG.append("You can find a character by writing his name and clicking Find bellow:");
-		replyMSG.append("<edit var=\"character_name\" width=110><br>");
-		replyMSG.append("<button value=\"Find\" action=\"bypass -h admin_find_character $character_name\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><br><br>");
-		replyMSG.append("<center><button value=\"Back\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
 		replyMSG.append("</body></html>");
 		
 		adminReply.setHtml(replyMSG.toString());
@@ -201,66 +209,44 @@
 
 		NpcHtmlMessage adminReply = new NpcHtmlMessage(5); 
 		
-		StringBuffer replyMSG = new StringBuffer("<html><title>Character Information</title>");
-		replyMSG.append("<body>");
-		
+		StringBuffer replyMSG = new StringBuffer("<html><body>");
+		replyMSG.append("<table width=260><tr>");
+		replyMSG.append("<td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td width=180><center>Character Selection Menu</center></td>");
+		replyMSG.append("<td width=40><button value=\"Back\" action=\"bypass -h admin_show_characters 0\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("</tr></table>");
+		replyMSG.append("<br><br>");
+		replyMSG.append("<center>Character Information:</center>");
 		replyMSG.append("<br>");
-		replyMSG.append("<center>" + player.getName() + "</center><p>");	
-		replyMSG.append("Clan: " + ClanTable.getInstance().getClan(player.getClanId()) + "<p>");		
-		replyMSG.append("Lv: " + player.getLevel() + " " + player.getTemplate().className + "<p>");
-		replyMSG.append("Exp: " + player.getExp() + "<p>");				
-
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>HP</td><td>" + player.getCurrentHp() + " / " + player.getMaxHp() + "</td><td>MP</td><td>" + player.getCurrentMp() + " / " + player.getMaxMp() + "</td></tr>");
-		replyMSG.append("<tr><td>SP</td><td>" + player.getSp() + "</td><td>Load</td><td>" + player.getCurrentLoad() + " / "+player.getMaxLoad()+"</td></tr>");		
-		replyMSG.append("<tr><td>ClassId</td><td>"+player.getClassId()+"</td></tr>");
-		replyMSG.append("</table>");
-		replyMSG.append("<br>");
 		
-		//Combat
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>Combat</td></tr>");
+		// Character Player Info
+		replyMSG.append("<table width=270>");		
+		replyMSG.append("<tr><td width=135>Name: " + player.getName() + "</td><td width=135>Lv: " + player.getLevel() + " " + player.getTemplate().className + "</td></tr>");	
+		replyMSG.append("<tr><td width=135>Clan: " + ClanTable.getInstance().getClan(player.getClanId()) + "</td><td width=135>Exp: " + player.getExp() + "</td></tr>");			
 		replyMSG.append("</table>");
 
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>P.ATK</td><td>" + player.getPAtk(null) + "</td><td>M.ATK</td><td>" + player.getMAtk(null,null) + "</td></tr>");
-		replyMSG.append("<tr><td>P.DEF</td><td>" + player.getPDef(null) + "</td><td>M.DEF</td><td>" + player.getMDef(null,null) + "</td></tr>");
-		replyMSG.append("<tr><td>Accuracy</td><td>" + player.getAccuracy() + "</td><td>Evasion</td><td>" + player.getEvasionRate(null) + "</td></tr>");
-		replyMSG.append("<tr><td>Critical</td><td>" + player.getCriticalHit(null,null) + "</td><td>Speed</td><td>" + player.getRunSpeed() + "</td></tr>");
-		replyMSG.append("<tr><td>ATK Spd</td><td>" + player.getPAtkSpd() + "</td><td>Casting Spd</td><td>" + player.getMAtkSpd() + "</td></tr>");		
+		// Character ClassID & Coördinates
+		replyMSG.append("<table width=270>");
+		replyMSG.append("<tr><td width=270>Class Template Id: " + player.getClassId() + "</td></tr>");
+		replyMSG.append("<tr><td width=270>Character Co-ordinates: " + player.getX() + " " + player.getY() + " " + player.getZ() + "</td></tr>");
 		replyMSG.append("</table>");
 		replyMSG.append("<br>");
-		//Basic
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>Basic</td></tr>");
+		
+		// Character Stats
+		replyMSG.append("<table width=270>");
+		replyMSG.append("<tr><td width=40></td><td width=70>Curent:</td><td width=70>Max:</td><td width=90></td></tr>");
+		replyMSG.append("<tr><td width=40>HP:</td><td width=70>" + player.getCurrentHp() + "</td><td width=70>" + player.getMaxHp() + "</td><td width=70>Karma: " + player.getKarma() + "</td><td width=20></td></tr>");
+		replyMSG.append("<tr><td width=40>MP:</td><td width=70>" + player.getCurrentMp() + "</td><td width=70>" + player.getMaxMp() + "</td><td width=70>Pvp Kills: " + player.getPvpKills() +  "</td><td width=20></td></tr>");
+		replyMSG.append("<tr><td width=40>Load:</td><td width=70>" + player.getCurrentLoad() + "</td><td width=70>" + player.getMaxLoad() + "</td><td width=70>Pvp Flag: " + player.getPvpFlag() + "</td><td width=20></td></tr>");
+		replyMSG.append("<tr><td width=40>SP:</td><td width=70>" + player.getSp() + "</td><td width=70></td><td width=90></td></tr>");		
 		replyMSG.append("</table>");
-
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>STR</td><td>" + player.getSTR() + "</td><td>DEX</td><td>" + player.getDEX() + "</td><td>CON</td><td>" + player.getCON() + "</td></tr>");
-		replyMSG.append("<tr><td>INT</td><td>" + player.getINT() + "</td><td>WIT</td><td>" + player.getWIT() + "</td><td>MEN</td><td>" + player.getMEN() + "</td></tr>");		
+		replyMSG.append("<table width=270>");		
+		replyMSG.append("<tr><td width=60>P.ATK: " + player.getPAtk(null) + "</td><td width=100>M.ATK: " + player.getMAtk(null,null) + "</td><td width=40>Manage:</td></tr>");
+		replyMSG.append("<tr><td width=60>P.DEF: " + player.getPDef(null) + "</td><td width=100>M.DEF: " + player.getMDef(null,null) + "</td><td width=40></td></tr>");
+		replyMSG.append("<tr><td width=90>Accuracy: " + player.getAccuracy() + "</td><td width=70>Evasion: " + player.getEvasionRate(null) + "</td><td width=40><button value=\"Skills\" action=\"bypass -h admin_show_skills\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr>");
+		replyMSG.append("<tr><td width=90>Critical: " + player.getCriticalHit(null,null) + "</td><td width=70>Speed: " + player.getRunSpeed() + "</td><td width=40><button value=\"Stats\" action=\"bypass -h admin_edit_character\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr>");
+		replyMSG.append("<tr><td width=90>ATK Spd: " + player.getPAtkSpd() + "</td><td width=70>Casting Spd: " + player.getMAtkSpd() + "</td><td width=40><button value=\"Exp & Sp\" action=\"bypass -h admin_add_exp_sp_to_character\" width=60 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td></tr>");		
 		replyMSG.append("</table>");
-		replyMSG.append("<br>");
-		//Social
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>Social</td></tr>");
-		replyMSG.append("</table>");
-		
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>Karma</td><td>" + player.getKarma() + "</td><td>PvP</td><td>" + player.getPvpFlag() + " / " + player.getPvpKills() +  "</td></tr>");		
-		replyMSG.append("</table><p>");				
-
-		replyMSG.append("Character Co-ordinates: " + player.getX() + " " + player.getY() + " " + player.getZ());
-		replyMSG.append("<br>");
-		replyMSG.append("<center><button value=\"Logout Character\" action=\"bypass -h admin_character_disconnect\" width=140 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<br>");
-		replyMSG.append("<center><button value=\"Teleport Character\" action=\"bypass -h admin_show_teleport\" width=140 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<center><button value=\"Teleport to Character\" action=\"bypass -h admin_teleport_to_character\" width=140 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<center><button value=\"Add Xp-Sp to Character\" action=\"bypass -h admin_add_exp_sp_to_character\" width=140 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<center><button value=\"Edit Character\" action=\"bypass -h admin_edit_character\" width=140 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<center><button value=\"Manage skills\" action=\"bypass -h admin_show_skills\" width=140 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<center><button value=\"Switch to inventory\" action=\"bypass -h admin_set_context\" width=140 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<center><button value=\"Reset inventory\" action=\"bypass -h admin_reset_context\" width=140 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<br><center><button value=\"Back\" action=\"bypass -h admin_admin\" width=40 height=15></center>");
 		replyMSG.append("</body></html>");
 
 		adminReply.setHtml(replyMSG.toString());
@@ -361,48 +347,32 @@
 		
 		NpcHtmlMessage adminReply = new NpcHtmlMessage(5); 
 		
-		StringBuffer replyMSG = new StringBuffer("<html><title>Editing character " + player.getName() + "</title>");
-		replyMSG.append("<body>");
-		replyMSG.append("<br><center>Caution ! Dont forget that modifying players stats can ruin the game...</center><br>");
-		replyMSG.append("<center>Note: you must type all values to confirm modifications.</center><br>");
-		replyMSG.append("<br>");
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>HP</td><td>" + player.getCurrentHp() + " / " + player.getMaxHp() + "</td><td>MP</td><td>" + player.getCurrentMp() + " / " + player.getMaxMp() + "</td></tr>");
-		replyMSG.append("<tr><td>Load</td><td>" + player.getCurrentLoad() + " / "+player.getMaxLoad()+"</td></tr>");		
+		StringBuffer replyMSG = new StringBuffer("<html><body>");
+		replyMSG.append("<table width=260><tr>");
+		replyMSG.append("<td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td width=180><center>Character Selection Menu</center></td>");
+		replyMSG.append("<td width=40><button value=\"Back\" action=\"bypass -h admin_current_player\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("</tr></table>");
+		replyMSG.append("<br><br>");
+		replyMSG.append("<center>Editing character: " + player.getName() + "</center><br>");
+		replyMSG.append("<table width=270>");
+		replyMSG.append("<tr><td width=40></td><td width=70>Curent:</td><td width=70>Max:</td><td width=90></td></tr>");
+		replyMSG.append("<tr><td width=40>HP:</td><td width=70>" + player.getCurrentHp() + "</td><td width=70>" + player.getMaxHp() + "</td><td width=70>Karma: " + player.getKarma() + "</td><td width=20></td></tr>");
+		replyMSG.append("<tr><td width=40>MP:</td><td width=70>" + player.getCurrentMp() + "</td><td width=70>" + player.getMaxMp() + "</td><td width=70>Pvp Kills: " + player.getPvpKills() +  "</td><td width=20></td></tr>");
+		replyMSG.append("<tr><td width=40>Load:</td><td width=70>" + player.getCurrentLoad() + "</td><td width=70>" + player.getMaxLoad() + "</td><td width=70>Pvp Flag: " + player.getPvpFlag() + "</td><td width=20></td></tr>");
 		replyMSG.append("</table>");
-		replyMSG.append("<br>");
-		//Social
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>Social</td></tr>");
-		replyMSG.append("</table>");
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>Karma</td><td>" + player.getKarma() + "</td><td>PvP</td><td>" + player.getPvpFlag() + " / " + player.getPvpKills() +  "</td></tr>");		
-		replyMSG.append("<tr><td>ClassId</td><td>"+player.getClassId()+"</td></tr>");
-		replyMSG.append("</table><p>");			
-		replyMSG.append("<br>");
-		replyMSG.append("<center><table>");
-		replyMSG.append("<tr><td>Hp:</td>");
-		replyMSG.append("<td><edit var=\"hp\" width=110></td></tr>");
-		replyMSG.append("<tr><td>HpMax:</td>");
-		replyMSG.append("<td><edit var=\"hpmax\" width=110></td></tr>");
-		replyMSG.append("<tr><td>Mp:</td>");
-		replyMSG.append("<td><edit var=\"mp\" width=110></td></tr>");
-		replyMSG.append("<tr><td>MpMax:</td>");
-		replyMSG.append("<td><edit var=\"mpmax\" width=110></td></tr>");
-		replyMSG.append("<tr><td>MaxLoad:</td>");
-		replyMSG.append("<td><edit var=\"load\" width=110></td></tr>");
-		replyMSG.append("<tr><td>Karma:</td>");
-		replyMSG.append("<td><edit var=\"karma\" width=110></td></tr>");
-		replyMSG.append("<tr><td>PvpFlag:</td>");
-		replyMSG.append("<td><edit var=\"pvpflag\" width=110></td></tr>");
-		replyMSG.append("<tr><td>PvpKills:</td>");
-		replyMSG.append("<td><edit var=\"pvpkills\" width=110></td></tr>");
-		replyMSG.append("<tr><td>ClassId:</td>");
-		replyMSG.append("<td><edit var=\"classid\" width=110></td></tr>");
-		replyMSG.append("</table></center>");
-		replyMSG.append("<center><button value=\"Save modifications\" action=\"bypass -h" +
-				" admin_save_modifications $hp $hpmax $mp $mpmax $load $karma $pvpflag $pvpkills $classid\" width=140 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");
-		replyMSG.append("<br><center><button value=\"Back\" action=\"bypass -h admin_current_player\" width=40 height=15></center>");
+		replyMSG.append("<table width=270><tr><td>Class Template Id: " + player.getClassId() + "</td></tr></table><br>");
+		replyMSG.append("<table width=270>");
+		replyMSG.append("<tr><td>Note: Fill all values before saving the modifications.</td></tr>");
+		replyMSG.append("</table><br>");
+		replyMSG.append("<table width=270>");
+		replyMSG.append("<tr><td width=50>Hp:</td><td><edit var=\"hp\" width=50></td><td width=50>Karma:</td><td><edit var=\"karma\" width=50></td></tr>");
+		replyMSG.append("<tr><td width=50>HpMax:</td><td><edit var=\"hpmax\" width=50></td><td width=50>Pvp Flag:</td><td><edit var=\"pvpflag\" width=50></td></tr>");
+		replyMSG.append("<tr><td width=50>Mp:</td><td><edit var=\"mp\" width=50></td><td width=50>Pvp Kills:</td><td><edit var=\"pvpkills\" width=50></td></tr>");
+		replyMSG.append("<tr><td width=50>MpMax:</td><td><edit var=\"mpmax\" width=50></td><td width=50>Class Id:</td><td><edit var=\"classid\" width=50></td></tr>");
+		replyMSG.append("<tr><td width=50>MaxLoad:</td><td><edit var=\"load\" width=50></td><td width=50></td><td width=50></td></tr>");
+		replyMSG.append("</table><br>");
+		replyMSG.append("<center><button value=\"Save Changes\" action=\"bypass -h" + " admin_save_modifications $hp $hpmax $mp $mpmax $load $karma $pvpflag $pvpkills $classid\" width=80 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center><br>");
 		replyMSG.append("</body></html>");
 
 		adminReply.setHtml(replyMSG.toString());
@@ -418,34 +388,40 @@
 		NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
 		int CharactersFound = 0;
 		
-		StringBuffer replyMSG = new StringBuffer("<html><title>Character Search</title>");		
-		replyMSG.append("<body>");
-		replyMSG.append("<br>");
+		StringBuffer replyMSG = new StringBuffer("<html><body>");
+		replyMSG.append("<table width=260><tr>");
+		replyMSG.append("<td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("<td width=180><center>Character Selection Menu</center></td>");
+		replyMSG.append("<td width=40><button value=\"Back\" action=\"bypass -h admin_show_characters 0\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
+		replyMSG.append("</tr></table>");
+		replyMSG.append("<br><br>");
 		
-		replyMSG.append("<table>");		
-		replyMSG.append("<tr><td>Name</td><td>Class</td><td>Level</td></tr>");
-		
 		for (int i = 0; i < players.length; i++)
 		{	//Add player info into new Table row
 			
 			if (players[i].getName().startsWith((CharacterToFind)))
 			{
 				CharactersFound = CharactersFound+1;
-				replyMSG.append("<tr><td>" + "<a action=\"bypass -h admin_character_list " + players[i].getName() + "\">" + players[i].getName() + "</a>" + "</td><td>" + players[i].getTemplate().className + "</td><td>" + players[i].getLevel() + "</td></tr>");
+				replyMSG.append("<table width=270>");		
+				replyMSG.append("<tr><td width=80>Name</td><td width=110>Class</td><td width=40>Level</td></tr>");
+				replyMSG.append("<tr><td width=80><a action=\"bypass -h admin_character_list " + players[i].getName() + "\">" + players[i].getName() + "</a></td><td width=110>" + players[i].getTemplate().className + "</td><td width=40>" + players[i].getLevel() + "</td></tr>");
+				replyMSG.append("</table>");
 			}	
 		}
-		replyMSG.append("</table>");
 		
 		if (CharactersFound==0)
-		{
-			replyMSG.append("<br>Your search did not find any characters. Please try again:");
-			replyMSG.append("<edit var=\"character_name\" width=110><br>");
-			replyMSG.append("<button value=\"Find\" action=\"bypass -h admin_find_character $character_name\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
-			replyMSG.append("<br>");
+    	{
+			replyMSG.append("<table width=270>");
+			replyMSG.append("<tr><td width=270>Your search did not find any characters.</td></tr>");
+			replyMSG.append("<tr><td width=270>Please try again.<br></td></tr>");
+			replyMSG.append("</table><br>");
+			replyMSG.append("<center><table><tr><td>");
+			replyMSG.append("<edit var=\"character_name\" width=80></td><td><button value=\"Find\" action=\"bypass -h admin_find_character $character_name\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
+			replyMSG.append("</td></tr></table></center>");
 		}
 		else
 		{
-			replyMSG.append("<br>Found " + CharactersFound + " character");
+			replyMSG.append("<center><br>Found " + CharactersFound + " character");
 			
 			if (CharactersFound==1)
 			{
@@ -461,9 +437,7 @@
 
 		}
 		
-		replyMSG.append("<br>");
-		replyMSG.append("<center><button value=\"Back\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center>");		
-		replyMSG.append("</body></html>");
+		replyMSG.append("</center></body></html>");
 		
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);