diff --git a/system/templates/account.management.html.twig b/system/templates/account.management.html.twig
index b7fdf227..a79565bb 100644
--- a/system/templates/account.management.html.twig
+++ b/system/templates/account.management.html.twig
@@ -1,134 +1,187 @@
-<h1>My account</h1>
-<p>Welcome to your account page, {{ account }}<br>
-	You have {{ account_logged.getPremDays() }} days remaining premium account.</p>
+<style type="text/css">
+	#account-manage {
+		width: 100%;
+		margin: auto;
+		padding: 10px;
+	}
+	div#one {
+		width: 150px;
+		float: left;
+	}
+	div#two {
+		margin-left: 150px;
+		padding-left: 10px;
+	}
 
-{# if account dont have recovery key show hint #}
-{% if recovery_key is empty %}
-<div align="center">
-	You can register your account for increased protection. Click on "Register Account" and get your free recovery key today!<br/>
-	<form action="{{ getLink('account/register') }}" method="post">
-		<input type="submit" value="Register Account" />
-	</form>
-</div>
-<br/>
-{% endif %}
+	.vertical-menu a {
+		background-color: {{ config.lightborder }}; /* Grey background color */
+		color: black; /* Black text color */
+		display: block; /* Make the links appear below each other */
+		padding: 12px; /* Add some padding */
+		text-decoration: none; /* Remove underline from links */
+	}
 
-{% if email_request %}
-	<div align="center">
-		A request has been submitted to change the email address of this account to <b>{{ email_new }}</b>. After <b>{{ email_new_time|date("j F Y, G:i:s") }}</b> you can accept the new email address and finish the process. Please cancel the request if you do not want your email address to be changed! Also cancel the request if you have no access to the new email address!
-
-		<form action="{{ getLink('account/email') }}" method="post">
-			<input type="submit" value="Edit" />
-		</form>
+	.vertical-menu a:hover {
+		background-color: {{ config.darkborder }}; /* Dark grey background on mouse-over */
+	}
+</style>
+{% set menus = {
+	'Create Character': 'account/character/create','Delete Character': 'account/character/delete',
+	'Change Info': 'account/info', 'Change Password': 'account/password', 'Change Email': 'account/email'
+} %}
+<div id="account-manage">
+	<div id="one">
+		<div class="vertical-menu">
+			<a href="{{ getLink('account/manage') }}">My Account</a>
+			{% if recovery_key is empty %}
+				<a href="{{ getLink('account/register') }}">Register Account</a>
+			{% endif %}
+			{% for name, link in menus %}
+				<a href="{{ getLink(link) }}">{{ name }}</a>
+			{% endfor %}
+			{% if config.account_change_character_name %}
+				<a href="{{ getLink('account/character/name') }}">Change Name</a>
+			{% endif %}
+			{% if config.account_change_character_sex %}
+				<a href="{{ getLink('account/character/sex') }}">Change Sex</a>
+			{% endif %}
+			<a href="{{ getLink('account/logout') }}">Logout</a>
+		</div>
 	</div>
-<br/><br/>
-{% endif %}
-<h2>General Information</h2>
-<table width="100%">
-	<tr style="background-color: {{ config.lightborder }};" >
-		<td style="width: 90px;">Account {% if constant('USE_ACCOUNT_NAME') %}Name{% else %}Number{% endif %}:</td>
-		<td>{{ account }}</td>
-	</tr>
-	<tr style="background-color: {{ config.darkborder }};" >
-		<td style="width: 90px;">Email Address:</td>
-		<td>{{ account_email ~ email_change }}
-			<form action="{{ getLink('account/email') }}" method="post">
-				<input type="submit" value="Change Email" />
+	<div id="two">
+		<h1>My account</h1>
+		<p>Welcome to your account page, {{ account }}<br>
+			You have {{ account_logged.getPremDays() }} days remaining premium account.</p>
+
+		{# if account dont have recovery key show hint #}
+		{% if recovery_key is empty %}
+		<div align="center">
+			You can register your account for increased protection. Click on "Register Account" and get your free recovery key today!<br/>
+			<form action="{{ getLink('account/register') }}" method="post">
+				<input type="submit" value="Register Account" />
 			</form>
-		</td>
-	</tr>
-	<tr style="background-color: {{ config.lightborder }};" >
-		<td>Created:</td>
-		<td>{{ account_created|date("j F Y, G:i:s") }}</td>
-	</tr>
-	<tr style="background-color: {{ config.darkborder }};" >
-		<td>Last Login:</td>
-		<td>{{ "now"|date("j F Y, G:i:s") }}</td>
-	</tr>
-	{% autoescape false %}
-	<tr style="background-color: {{ config.lightborder }};" >
-		<td>Account Status:</td>
-		<td>{{ account_status }}</td>
-	</tr>
-	<tr style="background-color: {{ config.darkborder }};" >
-		<td>Registered:</td>
-		<td>{{ account_registered }}</td>
-	</tr>
-	{% endautoescape %}
-</table>
-<br/>
-<h2>Public Information</h2>
-<table width="100%">
-	<tr style="background-color: {{ config.lightborder }};" >
-		<td style="width: 80px;">Real name:</td>
-		<td>{{ account_rlname }}</td>
-	</tr>
-	<tr style="background-color: {{ config.darkborder }};" >
-		<td style="width: 80px;">Location:</td>
-		<td >{{ account_location }}</td>
-	</tr>
-</table>
-<form action="{{ getLink('account/info') }}" method="post">
-	<input type="submit" value="Change Info" />
-</form>
-<br/>
-<h2>Action Log</h2>
-<table>
-	<tr bgcolor="{{ config.vdarkborder }}" class="white">
-		<th>Action</th><th>Date</th><th>IP</th>
-	</tr>
-	{% autoescape false %}
-		{% set i = 0 %}
-		{% for action in actions %}
-			{% set i = i + 1 %}
-			<tr style="background-color: {{ getStyle(i) }}">
-				<td>{{ action.action }}</td>
-				<td>{{ action.date|date("jS F Y H:i:s") }}</td>
-				<td>{{ action.ip }}</td>
+		</div>
+		<br/>
+		{% endif %}
+
+		{% if email_request %}
+			<div align="center">
+				A request has been submitted to change the email address of this account to <b>{{ email_new }}</b>. After <b>{{ email_new_time|date("j F Y, G:i:s") }}</b> you can accept the new email address and finish the process. Please cancel the request if you do not want your email address to be changed! Also cancel the request if you have no access to the new email address!
+
+				<form action="{{ getLink('account/email') }}" method="post">
+					<input type="submit" value="Edit" />
+				</form>
+			</div>
+		<br/><br/>
+		{% endif %}
+		<h2>General Information</h2>
+		<table width="100%">
+			<tr style="background-color: {{ config.lightborder }};" >
+				<td style="width: 90px;">Account {% if constant('USE_ACCOUNT_NAME') %}Name{% else %}Number{% endif %}:</td>
+				<td>{{ account }}</td>
 			</tr>
-		{% endfor %}
-	{% endautoescape %}
-</table>
-<br/>
-<h2>Character list: {{ players|length }} characters.</h2>
-<table>
-	<tr bgcolor="{{ config.vdarkborder }}" class="white">
-		<th>Name</th><th>Level</th><th>Vocation</th><th>Town</th><th>Last login</th><th>Status</th><th>Hide</th><th>Edit</th>
-	</tr>
-	{% set i = 0 %}
-	{% for player in players %}
-		{% set i = i + 1 %}
-		<tr bgcolor="{{ getStyle(i) }}">
-			<td><a href="{{ getLink('characters/' ~ player.getName()|url_encode) }}">{{ player.getName() }}</a></td><td>{{ player.getLevel() }}</td><td>{{ config.vocations[player.getVocation()] }}</td><td>{{ config.towns[player.getTownId()] }}</td><td>{% if player.getLastLogin() > 0 %}{{ player.getLastLogin|date('d F Y (H:i)') }}{% else %}Never.{% endif %}</td><td>{%  if player.isOnline() %}<font color="green">ONLINE</font>{% else %}<font color="red">Offline</font>{% endif %}</td><td>{% if player.isHidden() %}Hidden{% else %}Visible{% endif %}</td><td>[<a href="{{ getLink('account/character/comment/' ~ player.getName|url_encode) }}" >Edit</a>]</td>
-		</tr>
-	{% endfor %}
-</table>
-<br/>
-<table>
-	<tr>
-		<td>
-			<form action="{{ getLink('account/character/create') }}" method="post" >
-				<input type="Submit" name="Create Character" value="Create Character" />
-			</form>
-		</td>
-		{% if config.account_change_character_name %}
-		<td>
-			<form action="{{ getLink('account/character/name') }}" method="post" >
-				<input type="Submit" name="Change Name" value="Change Name" />
-			</form>
-		</td>
-		{% endif %}
-		{% if config.account_change_character_sex %}
-		<td>
-			<form action="{{ getLink('account/character/sex') }}" method="post" >
-				<input type="Submit" name="Change Sex" value="Change Sex" />
-			</form>
-		</td>
-		{% endif %}
-		<td>
-			<form action="{{ getLink('account/character/delete') }}" method="post">
-				<input type="Submit" name="Delete Character" value="Delete Character" />
-			</form>
-		</td>
-	</tr>
-</table>
\ No newline at end of file
+			<tr style="background-color: {{ config.darkborder }};" >
+				<td style="width: 90px;">Email Address:</td>
+				<td>{{ account_email ~ email_change }}
+					<form action="{{ getLink('account/email') }}" method="post">
+						<input type="submit" value="Change Email" />
+					</form>
+				</td>
+			</tr>
+			<tr style="background-color: {{ config.lightborder }};" >
+				<td>Created:</td>
+				<td>{{ account_created|date("j F Y, G:i:s") }}</td>
+			</tr>
+			<tr style="background-color: {{ config.darkborder }};" >
+				<td>Last Login:</td>
+				<td>{{ "now"|date("j F Y, G:i:s") }}</td>
+			</tr>
+			{% autoescape false %}
+			<tr style="background-color: {{ config.lightborder }};" >
+				<td>Account Status:</td>
+				<td>{{ account_status }}</td>
+			</tr>
+			<tr style="background-color: {{ config.darkborder }};" >
+				<td>Registered:</td>
+				<td>{{ account_registered }}</td>
+			</tr>
+			{% endautoescape %}
+		</table>
+		<br/>
+		<h2>Public Information</h2>
+		<table width="100%">
+			<tr style="background-color: {{ config.lightborder }};" >
+				<td style="width: 80px;">Real name:</td>
+				<td>{{ account_rlname }}</td>
+			</tr>
+			<tr style="background-color: {{ config.darkborder }};" >
+				<td style="width: 80px;">Location:</td>
+				<td >{{ account_location }}</td>
+			</tr>
+		</table>
+		<form action="{{ getLink('account/info') }}" method="post">
+			<input type="submit" value="Change Info" />
+		</form>
+		<br/>
+		<h2>Action Log</h2>
+		<table>
+			<tr bgcolor="{{ config.vdarkborder }}" class="white">
+				<th>Action</th><th>Date</th><th>IP</th>
+			</tr>
+			{% autoescape false %}
+				{% set i = 0 %}
+				{% for action in actions %}
+					{% set i = i + 1 %}
+					<tr style="background-color: {{ getStyle(i) }}">
+						<td>{{ action.action }}</td>
+						<td>{{ action.date|date("jS F Y H:i:s") }}</td>
+						<td>{{ action.ip }}</td>
+					</tr>
+				{% endfor %}
+			{% endautoescape %}
+		</table>
+		<br/>
+		<h2>Character list: {{ players|length }} characters.</h2>
+		<table>
+			<tr bgcolor="{{ config.vdarkborder }}" class="white">
+				<th>Name</th><th>Level</th><th>Vocation</th><th>Town</th><th>Last login</th><th>Status</th><th>Hide</th><th>Edit</th>
+			</tr>
+			{% set i = 0 %}
+			{% for player in players %}
+				{% set i = i + 1 %}
+				<tr bgcolor="{{ getStyle(i) }}">
+					<td><a href="{{ getLink('characters/' ~ player.getName()|url_encode) }}">{{ player.getName() }}</a></td><td>{{ player.getLevel() }}</td><td>{{ config.vocations[player.getVocation()] }}</td><td>{{ config.towns[player.getTownId()] }}</td><td>{% if player.getLastLogin() > 0 %}{{ player.getLastLogin|date('d F Y (H:i)') }}{% else %}Never.{% endif %}</td><td>{%  if player.isOnline() %}<font color="green">ONLINE</font>{% else %}<font color="red">Offline</font>{% endif %}</td><td>{% if player.isHidden() %}Hidden{% else %}Visible{% endif %}</td><td>[<a href="{{ getLink('account/character/comment/' ~ player.getName|url_encode) }}" >Edit</a>]</td>
+				</tr>
+			{% endfor %}
+		</table>
+		<br/>
+		<table>
+			<tr>
+				<td>
+					<form action="{{ getLink('account/character/create') }}" method="post" >
+						<input type="Submit" name="Create Character" value="Create Character" />
+					</form>
+				</td>
+				{% if config.account_change_character_name %}
+				<td>
+					<form action="{{ getLink('account/character/name') }}" method="post" >
+						<input type="Submit" name="Change Name" value="Change Name" />
+					</form>
+				</td>
+				{% endif %}
+				{% if config.account_change_character_sex %}
+				<td>
+					<form action="{{ getLink('account/character/sex') }}" method="post" >
+						<input type="Submit" name="Change Sex" value="Change Sex" />
+					</form>
+				</td>
+				{% endif %}
+				<td>
+					<form action="{{ getLink('account/character/delete') }}" method="post">
+						<input type="Submit" name="Delete Character" value="Delete Character" />
+					</form>
+				</td>
+			</tr>
+		</table>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/kathrine/account.change_name.html.twig b/templates/kathrine/account.change_name.html.twig
deleted file mode 100644
index 67b89b18..00000000
--- a/templates/kathrine/account.change_name.html.twig
+++ /dev/null
@@ -1,44 +0,0 @@
-To change a name of character select player and choose a new name.<br/>
-<font color="red">Change name cost {{ config.account_change_character_name_points }} premium points. You have {{ points }} premium points.</font><br/><br/>
-<form action="{{ getLink('account/character/name') }}" method="post">
-	<input type="hidden" name="changenamesave" value="1">
-	<h3>Change Name</h3>
-	<table style="width:100%;">
-		<tr>
-			<td><span >Character:</td>
-			<td style="width:90%;" >
-				<select name="player_id">
-					{% for player in account_logged.getPlayersList() %}
-						<option value="{{ player.getId() }}">{{ player.getName() }}</option>
-					{% endfor %}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td ><span>New Name:</td>
-			<td>
-				<input type="text" name="name" id="name" onblur="checkName();" size="25" maxlength="25" >
-				<font size="1" face="verdana,arial,helvetica">
-					<div id="name_check">Please enter your character name.</div>
-				</font>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<input type="submit" name="Submit" value="Submit"/>
-			</td>
-		</tr>
-	</table>
-</form>
-<br/>
-<div style="text-align: center; margin: 0 auto;">
-	<table border="0" cellspacing="0" cellpadding="0">
-		<form action="{{ getLink('account/manage') }}" method="post">
-			<tr>
-				<td style="border:0px; text-align: center;">
-					<input type="submit" name="Back" value="Back"/>
-				</td>
-			</tr>
-		</form>
-	</table>
-</div>
\ No newline at end of file