diff --git a/less/chats.less b/less/chats.less
index 1a1d550..27e7bf3 100644
--- a/less/chats.less
+++ b/less/chats.less
@@ -163,4 +163,15 @@
 	textarea {
 		resize: none;
 	}
+}
+
+.expanded-chat {
+	h1 {
+		margin: 0px;
+		padding-bottom: 20px;
+	}
+
+	.chat-content {
+		padding-top: 10px;
+	}
 }
\ No newline at end of file
diff --git a/templates/chats.tpl b/templates/chats.tpl
index 0d95b58..9e9071b 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -1,36 +1,6 @@
 <div class="row">
-	<div class="col-sm-9">
-		<!-- IF !allowed -->
-		<div class="alert alert-warning">
-			[[error:chat-restricted]]
-		</div>
-		<!-- ENDIF !allowed -->
-		<!-- IF meta -->
-		<div class="panel panel-default expanded-chat" data-uid="{meta.uid}" data-username="{meta.username}">
-			<div class="panel-heading">
-				<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
-				<h2 class="panel-title">[[modules:chat.message-history]]</h2>
-			</div>
-			<div class="panel-body">
-				<span class="since-bar"><a href="#" class="selected" data-since="recent">[[recent:title]]</a> &bull; <a href="#" data-since="week">[[modules:chat.seven_days]]</a> &bull; <a href="#" data-since="month">[[modules:chat.thirty_days]]</a> &bull; <a href="#" data-since="threemonths">[[modules:chat.three_months]]</a></span>
-				<ul class="chat-content">
-					<!-- IMPORT partials/chat_messages.tpl -->
-				</ul>
-				<div class="input-group">
-					<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input" rows="1"></textarea>
-					<span class="input-group-btn">
-						<button class="btn btn-primary" type="button" data-action="send">[[modules:chat.send]]</button>
-					</span>
-				</div>
-			</div>
-		</div>
-		<!-- ELSE -->
-		<div class="alert alert-info">
-			[[modules:chat.no-messages]]
-		</div>
-		<!-- ENDIF meta -->
-	</div>
 	<div class="col-sm-3">
+	<!--
 		<div class="panel panel-default">
 			<div class="panel-heading">
 				<h2 class="panel-title">[[modules:chat.contacts]]</h2>
@@ -47,21 +17,48 @@
 				</ul>
 			</div>
 		</div>
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				<h2 class="panel-title">[[modules:chat.recent-chats]]</h2>
-			</div>
-			<div class="panel-body">
-				<ul class="chats-list recent-chats" data-nextstart="{nextStart}">
-					<!-- BEGIN chats -->
-					<li data-username="{chats.username}" data-uid="{chats.uid}" class="<!-- IF chats.unread -->unread<!-- ENDIF chats.unread -->">
-						<i component="user/status" title="[[global:{chats.status}]]" class="fa fa-circle status {chats.status}"></i>
-						<img class="user-img" src="{chats.picture}">
-						<span>{chats.username}</span>
-					</li>
-					<!-- END chats -->
-				</ul>
+	-->
+
+		<ul class="chats-list recent-chats" data-nextstart="{nextStart}">
+			<!-- BEGIN chats -->
+			<li data-username="{chats.username}" data-uid="{chats.uid}" class="<!-- IF chats.unread -->unread<!-- ENDIF chats.unread -->">
+				<i component="user/status" title="[[global:{chats.status}]]" class="fa fa-circle status {chats.status}"></i>
+				<img class="user-img" src="{chats.picture}">
+				<span>{chats.username}</span>
+			</li>
+			<!-- END chats -->
+		</ul>
+		
+	</div>
+
+	<div class="col-sm-9">
+		<!-- IF !allowed -->
+		<div class="alert alert-warning">
+			[[error:chat-restricted]]
+		</div>
+		<!-- ENDIF !allowed -->
+		<!-- IF meta -->
+		<div class="expanded-chat" data-uid="{meta.uid}" data-username="{meta.username}">
+			
+			<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
+			<h1>{meta.username}</h1>
+
+		
+			<span class="since-bar"><a href="#" class="selected" data-since="recent">[[recent:title]]</a> &bull; <a href="#" data-since="week">[[modules:chat.seven_days]]</a> &bull; <a href="#" data-since="month">[[modules:chat.thirty_days]]</a> &bull; <a href="#" data-since="threemonths">[[modules:chat.three_months]]</a></span>
+			<ul class="chat-content">
+				<!-- IMPORT partials/chat_messages.tpl -->
+			</ul>
+			<div class="input-group">
+				<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input" rows="1"></textarea>
+				<span class="input-group-btn">
+					<button class="btn btn-primary" type="button" data-action="send">[[modules:chat.send]]</button>
+				</span>
 			</div>
 		</div>
+		<!-- ELSE -->
+		<div class="alert alert-info">
+			[[modules:chat.no-messages]]
+		</div>
+		<!-- ENDIF meta -->
 	</div>
 </div>