diff --git a/template/dashboardBoxOnlineList.tpl b/template/dashboardBoxOnlineList.tpl
index c968165..c77b2bc 100644
--- a/template/dashboardBoxOnlineList.tpl
+++ b/template/dashboardBoxOnlineList.tpl
@@ -5,9 +5,25 @@
 </header>
 
 <div class="container marginTop">
-	<ul>
-	{foreach from=$rooms item='room'}
-		<li><strong>{$room}</strong>: <ul class="dataList">{implode from=$room->getUsers() item='user'}<li><a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{$user->userID}">{$user}</a></li>{/implode}</ul>
-	{/foreach}
+	<ul class="containerList">
+		{foreach from=$rooms item='room'}
+			{assign var='users' value=$room->getUsers()}
+			
+			{if $users|count > 0}
+				<li>
+					<div>
+						<div>
+							<hgroup class="containerHeadline">
+								<h1><a href="{link controller='Chat' object=$room}{/link}">{$room}</a><small> - {$room->topic|language}</small></h1>
+								<h2><strong>{#$users|count} Users</strong></h2>
+							</hgroup>
+							<ul class="dataList">
+								{implode from=$room->getUsers() item='user'}<li><a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{$user->userID}">{$user}</a></li>{/implode}
+							</ul>
+						</div>
+					</div>
+				</li>
+			{/if}
+		{/foreach}
 	</ul>
 </div>
\ No newline at end of file