diff --git a/frontend/css/cvm.css b/frontend/css/cvm.css
index 65f5a93..a733c9f 100644
--- a/frontend/css/cvm.css
+++ b/frontend/css/cvm.css
@@ -120,7 +120,26 @@ table.vpslist tr:hover
 	font-size: 16px;
 	font-weight: normal;
 	float: right;
-	margin-top: 46px;
+	margin-top: 28px;
+	text-align: right;
+}
+
+.userbox a
+{
+	display: block;
+	float: left;
+	padding: 5px 8px;
+	margin: 6px 3px 3px 3px;
+	font-size: 14px;
+	font-weight: bold;
+	text-decoration: none;
+	background-color: #31305E;
+	color: white;
+}
+
+.userbox a:hover
+{
+	background-color: #15144E;
 }
 
 .main
diff --git a/frontend/rewrite.php b/frontend/rewrite.php
index 8eb298e..e5306c1 100644
--- a/frontend/rewrite.php
+++ b/frontend/rewrite.php
@@ -32,7 +32,7 @@ else
 	$sLoggedIn = false;
 }
 
-$sMainContents = "hai";
+$sMainContents = "";
 $sMainClass = "";
 $sPageTitle = "";
 
diff --git a/frontend/templates/main.tpl b/frontend/templates/main.tpl
index 815fd49..9730bd8 100644
--- a/frontend/templates/main.tpl
+++ b/frontend/templates/main.tpl
@@ -17,7 +17,9 @@
 				<%if logged-in == true>
 					<div class="userbox">
 						<div>You are logged in as <strong><%?username></strong>.</div>
-						<div><a href="/account/">Account settings</a> | <a href="/">My VPSes</a></div> | <a href="/logout/">Log out</a></div>
+						<a href="/account/">Account settings</a>
+						<a href="/">My VPSes</a>
+						<a href="/logout/">Log out</a>
 					</div>
 				<%/if>
 			</div>