diff --git a/templates/rightnav.php b/templates/rightnav.php
index 6eb3705..39170fb 100644
--- a/templates/rightnav.php
+++ b/templates/rightnav.php
@@ -1,39 +1,30 @@
 <?php
-$template = <<<THEVERYENDOFYOU
-<table width="100%">
-<tr><td class="title"><img src="/img/button_character.gif" alt="Character" title="Character" /></td></tr>
-<tr><td>
-<b>{{username}}</b><br>
-Level: {{level}}<br>
-Exp: {{experience}}<br>
-Gold: {{gold}}<br>
-HP: {{currenthp}}<br>
-MP: {{currentmp}}<br>
-TP: {{currenttp}}<br>
-{{statbars}}<br>
-<a href="javascript:opencharpopup()">Extended Stats</a>
-</td></tr>
-</table><br>
+$template = <<<HTML
+<section>
+	<div class="title"><img src="/img/button_character.gif" alt="Character" title="Character"></div>
+	<b>{{username}}</b><br>
+	Level: {{level}}<br>
+	Exp: {{experience}}<br>
+	Gold: {{gold}}<br>
+	HP: {{currenthp}}<br>
+	MP: {{currentmp}}<br>
+	TP: {{currenttp}}<br>
+	{{statbars}}<br>
+	<a href="javascript:opencharpopup()">Extended Stats</a>
+</section>
 
-<table width="100%">
-<tr><td class="title"><img src="/img/button_inventory.gif" alt="Inventory" title="Inventory" /></td></tr>
-<tr><td>
-<table width="100%">
-<tr><td><img src="/img/icon_weapon.gif" alt="Weapon" title="Weapon" /></td><td width="100%">Weapon: {{weaponname}}</td></tr>
-<tr><td><img src="/img/icon_armor.gif" alt="Armor" title="Armor" /></td><td width="100%">Armor: {{armorname}}</td></tr>
-<tr><td><img src="/img/icon_shield.gif" alt="Shield" title="Shield" /></td><td width="100%">Shield: {{shieldname}}</td></tr>
-</table>
-Slot 1: {{slot1name}}<br>
-Slot 2: {{slot2name}}<br>
-Slot 3: {{slot3name}}
-</td></tr>
-</table><br>
+<section>
+	<div class="title"><img src="/img/button_inventory.gif" alt="Inventory" title="Inventory"></div>
+	<img src="/img/icon_weapon.gif" alt="Weapon" title="Weapon"> Weapon: {{weaponname}}<br>
+	<img src="/img/icon_armor.gif" alt="Armor" title="Armor"> Armor: {{armorname}}<br>
+	<img src="/img/icon_shield.gif" alt="Shield" title="Shield"> Shield: {{shieldname}}<br>
+	Slot 1: {{slot1name}}<br>
+	Slot 2: {{slot2name}}<br>
+	Slot 3: {{slot3name}}
+</section>
 
-<table width="100%">
-<tr><td class="title"><img src="/img/button_fastspells.gif" alt="Fast Spells" title="Fast Spells" /></td></tr>
-<tr><td>
-{{magiclist}}
-</td></tr>
-</table><br>
-THEVERYENDOFYOU;
-?>
+<section>
+	<div class="title"><img src="/img/button_fastspells.gif" alt="Fast Spells" title="Fast Spells"></div>
+	{{magiclist}}
+</section>
+HTML;
