diff --git a/assets/dk.css b/assets/dk.css
index 7123f14..cbdb308 100644
--- a/assets/dk.css
+++ b/assets/dk.css
@@ -585,4 +585,14 @@ hr {
 
 .hidden {
 	display: none;
-}
\ No newline at end of file
+}
+
+div.top-nav {
+	& > a {
+		font-weight: normal;
+
+		&:not(:last-of-type) {
+			margin-right: 1rem;
+		}
+	}
+}
diff --git a/assets/images/button_help.gif b/assets/images/button_help.gif
deleted file mode 100644
index b108da7..0000000
Binary files a/assets/images/button_help.gif and /dev/null differ
diff --git a/assets/images/button_login.gif b/assets/images/button_login.gif
deleted file mode 100644
index 89c612a..0000000
Binary files a/assets/images/button_login.gif and /dev/null differ
diff --git a/assets/images/button_logout.gif b/assets/images/button_logout.gif
deleted file mode 100644
index c2343c5..0000000
Binary files a/assets/images/button_logout.gif and /dev/null differ
diff --git a/assets/images/button_register.gif b/assets/images/button_register.gif
deleted file mode 100644
index e635590..0000000
Binary files a/assets/images/button_register.gif and /dev/null differ
diff --git a/assets/images/icon_armor.gif b/assets/images/icons/armor.gif
similarity index 100%
rename from assets/images/icon_armor.gif
rename to assets/images/icons/armor.gif
diff --git a/assets/images/icon_shield.gif b/assets/images/icons/shield.gif
similarity index 100%
rename from assets/images/icon_shield.gif
rename to assets/images/icons/shield.gif
diff --git a/assets/images/icon_weapon.gif b/assets/images/icons/weapon.gif
similarity index 100%
rename from assets/images/icon_weapon.gif
rename to assets/images/icons/weapon.gif
diff --git a/templates/leftside.html b/templates/leftside.html
index e9a1014..de1871c 100644
--- a/templates/leftside.html
+++ b/templates/leftside.html
@@ -29,17 +29,15 @@
 	<h5>Town Maps</h5>
 	{if #_towns > 0}
 		{for t in _towns}
-			{if user.HasTownMap(t.ID)}
 			{if town != nil and t.Name == town.Name}
 				<span>{t.Name} <i>(here)</i></span>
 			{else}
 				{if user.TP < t.TPCost}
 					<span class="light">{t.Name}</span>
 				{else}
-						<a class="teleport-link" href="/teleport/{t.ID}" data-town="{t.Name}" data-cost="{t.TPCost}">{t.Name}</a>
+					<a class="teleport-link" href="/teleport/{t.ID}" data-town="{t.Name}" data-cost="{t.TPCost}">{t.Name}</a>
 				{/if}
 			{/if}
-			{/if}
 		{/for}
 	{else}
 		<i>No town maps</i>
diff --git a/templates/rightside.html b/templates/rightside.html
index 400154c..7ee2719 100644
--- a/templates/rightside.html
+++ b/templates/rightside.html
@@ -32,7 +32,7 @@
 	<h5>Equipment</h5>
 
 	<div>
-		<img src="/assets/images/icon_weapon.gif" alt="Weapon" title="Weapon">
+		<img src="/assets/images/icons/weapon.gif" alt="Weapon" title="Weapon">
 		{if user.WeaponName != ""}
 			{user.WeaponName}
 		{else}
@@ -40,7 +40,7 @@
 		{/if}
 	</div>
 	<div>
-		<img src="/assets/images/icon_armor.gif" alt="Armor" title="Armor">
+		<img src="/assets/images/icons/armor.gif" alt="Armor" title="Armor">
 		{if user.ArmorName != ""}
 			{user.ArmorName}
 		{else}
@@ -48,7 +48,7 @@
 		{/if}
 	</div>
 	<div>
-		<img src="/assets/images/icon_shield.gif" alt="Shield" title="Shield">
+		<img src="/assets/images/icons/shield.gif" alt="Shield" title="Shield">
 		{if user.ShieldName != ""}
 			{user.ShieldName}
 		{else}
diff --git a/templates/topnav.html b/templates/topnav.html
index 5b3f093..cba61e7 100644
--- a/templates/topnav.html
+++ b/templates/topnav.html
@@ -1,8 +1,9 @@
-{if authenticated}
-<a class="logout-link"><img src="/assets/images/button_logout.gif" alt="Log Out" title="Log Out"></a>
-<a href="/help"><img src="/assets/images/button_help.gif" alt="Help" title="Help"></a>
-{else}
-<a href="/login"><img src="/assets/images/button_login.gif" alt="Log In" title="Log In"></a>
-<a href="/register"><img src="/assets/images/button_register.gif" alt="Register" title="Register"></a>
-<a href="/help"><img src="/assets/images/button_help.gif" alt="Help" title="Help"></a>
-{/if}
\ No newline at end of file
+<div class="top-nav">
+	{if authenticated}
+		<a class="logout-link seagram">Log Out</a>
+	{else}
+		<a href="/login" class="seagram">Log In</a>
+		<a href="/register" class="seagram">Register</a>
+	{/if}
+	<a href="/help" class="seagram">Help</a>
+</div>
diff --git a/templates/town/shop.html b/templates/town/shop.html
index 0e3ddaa..51edcb5 100644
--- a/templates/town/shop.html
+++ b/templates/town/shop.html
@@ -15,13 +15,13 @@
 				<tr>
 					<td>
 						{if item.Type == 1}
-							<img src="/assets/images/icon_weapon.gif" alt="Weapon" title="Weapon">
+							<img src="/assets/images/icons/weapon.gif" alt="Weapon" title="Weapon">
 						{/if}
 						{if item.Type == 2}
-							<img src="/assets/images/icon_armor.gif" alt="Armor" title="Armor">
+							<img src="/assets/images/icons/armor.gif" alt="Armor" title="Armor">
 						{/if}
 						{if item.Type == 3}
-							<img src="/assets/images/icon_shield.gif" alt="Shield" title="Shield">
+							<img src="/assets/images/icons/shield.gif" alt="Shield" title="Shield">
 						{/if}
 					</td>
 					<td>
diff --git a/templates/town/town.html b/templates/town/town.html
index e1b4818..55fee5d 100644
--- a/templates/town/town.html
+++ b/templates/town/town.html
@@ -4,7 +4,6 @@
 <div class="town">
 	<section class="options">
 		<h2 class="title mb-1">Welcome to {town.Name}</h2>
-		<b>Town Options</b><br>
 		<ul class="unstyled">
 			<li><a href="/town/inn">Rest at the Inn</a></li>
 			<li><a href="/town/shop">Browse the Shop</a></li>