diff --git a/frontend/css/cvm.css b/frontend/css/cvm.css
index 9b8267c..65f5a93 100644
--- a/frontend/css/cvm.css
+++ b/frontend/css/cvm.css
@@ -76,11 +76,27 @@ table.vpsinfo th
 	width: 150px;
 }
 
+table.vpslist tr:hover
+{
+	background-color: #BABAD0;
+}
+
+.clickable a
+{
+	color: black;
+	text-decoration: none;
+}
+
 .clear
 {
 	clear: both;
 }
 
+.clickable
+{
+	cursor: pointer;
+}
+
 .preload
 {
 	width: 1px;
diff --git a/frontend/js/cvm.js b/frontend/js/cvm.js
index b0758b9..df873c0 100644
--- a/frontend/js/cvm.js
+++ b/frontend/js/cvm.js
@@ -1,6 +1,10 @@
 var command_running = false;
 
 $(function(){
+	$('.clickable').click(function(){
+		window.location.href = $(this).data('url');
+	});
+	
 	$('.button-loader').click(function(){
 		if(command_running === false)
 		{
diff --git a/frontend/module.list.php b/frontend/module.list.php
index b913e60..0dc9c94 100644
--- a/frontend/module.list.php
+++ b/frontend/module.list.php
@@ -23,6 +23,7 @@ if($sLoggedIn === true)
 	{
 		$sContainer = new Container($row);
 		$sContainerList[] = array(
+			'id'			=> $sContainer->sId,
 			'hostname'		=> $sContainer->sHostname,
 			'node'			=> $sContainer->sNode->sName,
 			'node-hostname'		=> $sContainer->sNode->sHostname,
diff --git a/frontend/rewrite.php b/frontend/rewrite.php
index 1e1ab7a..8eb298e 100644
--- a/frontend/rewrite.php
+++ b/frontend/rewrite.php
@@ -16,7 +16,7 @@ require("includes/include.base.php");
 
 $sTemplateParameters = array();
 
-//$_SESSION['userid'] = 1;
+$_SESSION['userid'] = 1;
 
 if(!empty($_SESSION['userid']))
 {
diff --git a/frontend/templates/list.tpl b/frontend/templates/list.tpl
index a648259..04999d1 100644
--- a/frontend/templates/list.tpl
+++ b/frontend/templates/list.tpl
@@ -1,4 +1,4 @@
-<table>
+<table class="vpslist">
 	<tr>
 		<th></th>
 		<th>Hostname</th>
@@ -9,7 +9,7 @@
 		<th>Template</th>
 	</tr>
 	<%foreach container in containers>
-		<tr>
+		<tr class="clickable" data-url="/<%?container[id]>/">
 			<td class="container-status">
 				<%if container[status] == running>
 					<img src="/images/icon_online.png" alt="Running">
@@ -19,21 +19,29 @@
 					<img src="/images/icon_suspended.png" alt="Suspended">
 				<%/if>
 			</td>
-			<td><%?container[hostname]></td>
 			<td>
-				<%if container[virtualization-type] == 1>
-					OpenVZ
-				<%/if><%if container[virtualization-type] == 2>
-					Xen PV
-				<%/if><%if container[virtualization-type] == 3>
-					Xen HVM
-				<%/if><%if container[virtualization-type] == 4>
-					KVM
-				<%/if>
+				<a href="/<%?container[id]>/">
+					<%?container[hostname]>
+				</a>
+			</td>
+			<td>
+				<a href="/<%?container[id]>/">
+					<%if container[virtualization-type] == 1>
+						OpenVZ
+					<%/if><%if container[virtualization-type] == 2>
+						Xen PV
+					<%/if><%if container[virtualization-type] == 3>
+						Xen HVM
+					<%/if><%if container[virtualization-type] == 4>
+						KVM
+					<%/if>
+				</a>
 			</td>
 			<td>
-				<span class="nodename"><%?container[node]></span>
-				<span class="hostname">(<%?container[node-hostname]>)</span>
+				<a href="/<%?container[id]>/">
+					<span class="nodename"><%?container[node]></span>
+					<span class="hostname">(<%?container[node-hostname]>)</span>
+				</a>
 			</td>
 			<td>
 				<%?container[diskspace]>
diff --git a/frontend/templates/main.tpl b/frontend/templates/main.tpl
index a18ebe1..815fd49 100644
--- a/frontend/templates/main.tpl
+++ b/frontend/templates/main.tpl
@@ -17,7 +17,7 @@
 				<%if logged-in == true>
 					<div class="userbox">
 						<div>You are logged in as <strong><%?username></strong>.</div>
-						<div><a href="/">Account overview</a> | <a href="/containers/">My VPSes</a></div>
+						<div><a href="/account/">Account settings</a> | <a href="/">My VPSes</a></div> | <a href="/logout/">Log out</a></div>
 					</div>
 				<%/if>
 			</div>