diff --git a/frontend/css/cvm.css b/frontend/css/cvm.css
index 810061e..462c376 100644
--- a/frontend/css/cvm.css
+++ b/frontend/css/cvm.css
@@ -32,12 +32,28 @@ p
 
 table
 {
-	
+	font-size: 15px;
+	border-spacing: 0px;
+	width: 100%;
 }
 
 th
 {
 	text-align: left;
+	background-color: #12005E;
+	color: white;
+	padding: 3px 4px;
+}
+
+td
+{
+	vertical-align: top;
+	padding: 4px 4px 0px 4px;
+}
+
+td.container-status img
+{
+	margin-top: 3px;
 }
 
 table.vpsinfo td
@@ -291,6 +307,21 @@ table.vpsinfo td
 	margin-top: 4px;
 }
 
+.nodename
+{
+	font-size: 14px;
+}
+
+.hostname
+{
+	font-size: 13px;
+	color: gray;
+}
+
+.unit
+{
+	color: gray;
+}
 
 /* CPHPErrorHandler styles */
 
diff --git a/frontend/module.list.php b/frontend/module.list.php
index 8beeddc..b913e60 100644
--- a/frontend/module.list.php
+++ b/frontend/module.list.php
@@ -27,8 +27,10 @@ if($sLoggedIn === true)
 			'node'			=> $sContainer->sNode->sName,
 			'node-hostname'		=> $sContainer->sNode->sHostname,
 			'template'		=> $sContainer->sTemplate->sName,
-			'diskspace'		=> $sContainer->sDiskSpace,
+			'diskspace'		=> number_format($sContainer->sDiskSpace / 1024),
+			'diskspace-unit'	=> "GB",
 			'guaranteed-ram'	=> $sContainer->sGuaranteedRam,
+			'guaranteed-ram-unit'	=> "MB",
 			'status'		=> $sContainer->sStatusText,
 			'virtualization-type'	=> $sContainer->sVirtualizationType
 		);
diff --git a/frontend/templates/list.tpl b/frontend/templates/list.tpl
index e3ae97b..a648259 100644
--- a/frontend/templates/list.tpl
+++ b/frontend/templates/list.tpl
@@ -10,7 +10,7 @@
 	</tr>
 	<%foreach container in containers>
 		<tr>
-			<td>
+			<td class="container-status">
 				<%if container[status] == running>
 					<img src="/images/icon_online.png" alt="Running">
 				<%/if><%if container[status] == stopped>
@@ -31,9 +31,18 @@
 					KVM
 				<%/if>
 			</td>
-			<td><%?container[node]> (<%?container[node-hostname]>)</td>
-			<td><%?container[diskspace]></td>
-			<td><%?container[guaranteed-ram]></td>
+			<td>
+				<span class="nodename"><%?container[node]></span>
+				<span class="hostname">(<%?container[node-hostname]>)</span>
+			</td>
+			<td>
+				<%?container[diskspace]>
+				<span class="unit"><%?container[diskspace-unit]></span>
+			</td>
+			<td>
+				<%?container[guaranteed-ram]>
+				<span class="unit"><%?container[guaranteed-ram-unit]></span>
+			</td>
 			<td><%?container[template]></td>
 		</tr>
 	<%/foreach>