diff --git a/file/style/be.bastelstu.wcf.chat.less b/file/style/be.bastelstu.wcf.chat.less
index 0795d7f..9085427 100644
--- a/file/style/be.bastelstu.wcf.chat.less
+++ b/file/style/be.bastelstu.wcf.chat.less
@@ -12,22 +12,18 @@
 		position: relative;
 	}
 	
-	#content {
-		text-align: left;
+	#timsChatTopic {
+		padding: @wcfGapTiny;
+		.transition(height, .2s);
+		.transition(padding-top, .2s);
+		.transition(padding-bottom, .2s);
 		
-		#timsChatTopic {
-			padding: @wcfGapTiny;
-			.transition(height, .2s);
-			.transition(padding-top, .2s);
-			.transition(padding-bottom, .2s);
-			
-			&.empty {
-				height: 0px;
-				overflow: hidden;
-				border: 0px;
-				padding: 0px;
-				margin: 0px;
-			}
+		&.empty {
+			height: 0px;
+			overflow: hidden;
+			border: 0px;
+			padding: 0px;
+			margin: 0px;
 		}
 	}
 	
@@ -217,10 +213,6 @@
 		margin-top: @wcfGapMedium;
 	}
 	
-	@media only screen and (min-width: 801px) {
-		
-	}
-	
 	@media only screen and (max-width: 800px) {
 		#timsChatMessageContainer {
 			overflow: auto;
@@ -272,31 +264,30 @@ html.fullscreen {
 	#content {
 		height: 100%;
 		
-		> div {
-			width: 100%;
-			height: 100%;
-
-			display: -moz-box;
-			display: -webkit-box;
-			display: -webkit-flex;
-			display: -ms-flexbox;
-			display: flex;
-			
-			-webkit-box-orient: vertical;
-			-moz-box-orient: vertical;
-			-webkit-box-direction: normal;
-			-moz-box-direction: normal;
-			-webkit-flex-direction: column;
-			-ms-flex-direction: column;
-			flex-direction: column;
-			
-			.timsChatMessageContainer {
-				-webkit-box-flex: 1;
-				-moz-box-flex: 1;
-				-webkit-flex: 1 0 auto;
-				-ms-flex: 1 0 auto;
-				flex: 1 0 auto;
-			}
+		-moz-box-sizing: border-box;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		
+		display: -moz-box;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		
+		-webkit-box-orient: vertical;
+		-moz-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-moz-box-direction: normal;
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+		
+		.timsChatMessageContainer {
+			-webkit-box-flex: 1;
+			-moz-box-flex: 1;
+			-webkit-flex: 1 0 auto;
+			-ms-flex: 1 0 auto;
+			flex: 1 0 auto;
 		}
 	}
 	
@@ -304,7 +295,7 @@ html.fullscreen {
 		margin-bottom: @wcfGapMedium;
 	}
 	
-	#tplChat, #tplChatLog {
+	#tplChat {
 		height: 100%;
 		overflow: hidden;
 		
diff --git a/template/chat.tpl b/template/chat.tpl
index 13d3164..eeaff63 100644
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -90,44 +90,42 @@
 	{capture assign='headerNavigation'}{include application='chat' file='navigationInclude'}{/capture}
 	{include file='header' sandbox=false sidebarOrientation='right'}
 	
-	<div>
-		<div id="timsChatTopic" class="container{if $room->topic|language === ''} empty{/if}">{$room->topic|language}</div>
-		
-		<div id="timsChatMessageContainer" class="timsChatMessageContainer marginTop container active">
-			<p class="error noJsOnly" style="display: none;">{lang}chat.general.noJs{/lang}</p>
-			<ul>
-			</ul>
-		</div>
-		
-		<form id="timsChatForm" action="{link application='chat' controller='Chat' action='Send'}{/link}" method="post">
-			<fieldset>
-				<dl class="wide" id="timsChatInputContainer">
-					<dd>
-						<input id="timsChatInput" accesskey="w" type="text" class="inputText long" name="text" autocomplete="off" maxlength="{@CHAT_MAX_LENGTH}" disabled="disabled" required="required" placeholder="{lang}chat.general.submit.default{/lang}" />
-						<small class="innerError" style="display: none;">Lorem ipsum dolor sit amet.</small>
-					</dd>
-				</dl>
-			</fieldset>
-			<button type="submit" class="invisible" accesskey="s"></button>
-		</form>
-
-		{if MODULE_SMILEY && $smileyCategories|count}
-			{include file='messageFormSmilies' wysiwygSelector=''}
-		{/if}
-		
-		<nav id="timsChatOptions" class="marginTop">
-			<span class="invisible">{lang}chat.general.controls{/lang}</span>
-			<ul class="smallButtons buttonGroup">
-				<li><a id="timsChatAutoscroll" accesskey="d" class="button active timsChatToggle jsTooltip" title="{lang}chat.general.scroll{/lang}" data-status="1"><span class="icon icon16 icon-arrow-down"></span><span class="invisible">{lang}chat.general.scroll{/lang}</span></a></li>{*
-				*}<li><a id="timsChatFullscreen" accesskey="f" class="button timsChatToggle jsTooltip" title="{lang}chat.general.fullscreen{/lang}" data-status="0"><span class="icon icon16 icon-fullscreen"></span><span class="invisible">{lang}chat.general.fullscreen{/lang}</span></a></li>{*
-				*}<li><a id="timsChatNotify" accesskey="n" class="button timsChatToggle jsTooltip" title="{lang}chat.general.notify{/lang}" data-status="0"><span class="icon icon16 icon-bell-alt"></span><span class="invisible">{lang}chat.general.notify{/lang}</span></a></li>{*
-				*}<li{if !MODULE_SMILEY || !$smileyCategories|count} style="display: none;"{/if}><a id="timsChatSmilies" accesskey="e" class="button{if ENABLE_SMILIES_DEFAULT_VALUE} active{/if} timsChatToggle jsTooltip" title="{lang}chat.general.smilies{/lang}" data-status="{@ENABLE_SMILIES_DEFAULT_VALUE}"><span class="icon icon16 icon-smile"></span><span class="invisible">{lang}chat.general.smilies{/lang}</span></a></li>{*
-				*}<li><a id="timsChatClear" class="button jsTooltip" title="{lang}chat.general.clear{/lang}"><span class="icon icon16 icon-remove"></span><span class="invisible">{lang}chat.general.clear{/lang}</span></a></li>{*
-				*}<li><a id="timsChatMark" class="button timsChatToggle jsTooltip" title="{lang}chat.general.mark{/lang}" data-status="0"><span class="icon icon16 icon-check"></span><span class="invisible">{lang}chat.general.mark{/lang}</span></a></li>
-			</ul>
-		</nav>
+	<div id="timsChatTopic" class="container{if $room->topic|language === ''} empty{/if}">{$room->topic|language}</div>
+	
+	<div id="timsChatMessageContainer" class="timsChatMessageContainer marginTop container active">
+		<p class="error noJsOnly" style="display: none;">{lang}chat.general.noJs{/lang}</p>
+		<ul>
+		</ul>
 	</div>
 	
+	<form id="timsChatForm" action="{link application='chat' controller='Chat' action='Send'}{/link}" method="post">
+		<fieldset>
+			<dl class="wide" id="timsChatInputContainer">
+				<dd>
+					<input id="timsChatInput" accesskey="w" type="text" class="inputText long" name="text" autocomplete="off" maxlength="{@CHAT_MAX_LENGTH}" disabled="disabled" required="required" placeholder="{lang}chat.general.submit.default{/lang}" />
+					<small class="innerError" style="display: none;">Lorem ipsum dolor sit amet.</small>
+				</dd>
+			</dl>
+		</fieldset>
+		<button type="submit" class="invisible" accesskey="s"></button>
+	</form>
+
+	{if MODULE_SMILEY && $smileyCategories|count}
+		{include file='messageFormSmilies' wysiwygSelector=''}
+	{/if}
+	
+	<nav id="timsChatOptions" class="marginTop">
+		<span class="invisible">{lang}chat.general.controls{/lang}</span>
+		<ul class="smallButtons buttonGroup">
+			<li><a id="timsChatAutoscroll" accesskey="d" class="button active timsChatToggle jsTooltip" title="{lang}chat.general.scroll{/lang}" data-status="1"><span class="icon icon16 icon-arrow-down"></span><span class="invisible">{lang}chat.general.scroll{/lang}</span></a></li>{*
+			*}<li><a id="timsChatFullscreen" accesskey="f" class="button timsChatToggle jsTooltip" title="{lang}chat.general.fullscreen{/lang}" data-status="0"><span class="icon icon16 icon-fullscreen"></span><span class="invisible">{lang}chat.general.fullscreen{/lang}</span></a></li>{*
+			*}<li><a id="timsChatNotify" accesskey="n" class="button timsChatToggle jsTooltip" title="{lang}chat.general.notify{/lang}" data-status="0"><span class="icon icon16 icon-bell-alt"></span><span class="invisible">{lang}chat.general.notify{/lang}</span></a></li>{*
+			*}<li{if !MODULE_SMILEY || !$smileyCategories|count} style="display: none;"{/if}><a id="timsChatSmilies" accesskey="e" class="button{if ENABLE_SMILIES_DEFAULT_VALUE} active{/if} timsChatToggle jsTooltip" title="{lang}chat.general.smilies{/lang}" data-status="{@ENABLE_SMILIES_DEFAULT_VALUE}"><span class="icon icon16 icon-smile"></span><span class="invisible">{lang}chat.general.smilies{/lang}</span></a></li>{*
+			*}<li><a id="timsChatClear" class="button jsTooltip" title="{lang}chat.general.clear{/lang}"><span class="icon icon16 icon-remove"></span><span class="invisible">{lang}chat.general.clear{/lang}</span></a></li>{*
+			*}<li><a id="timsChatMark" class="button timsChatToggle jsTooltip" title="{lang}chat.general.mark{/lang}" data-status="0"><span class="icon icon16 icon-check"></span><span class="invisible">{lang}chat.general.mark{/lang}</span></a></li>
+		</ul>
+	</nav>
+	
 	{include file='footer' sandbox=false}
 </body>
 </html>