diff --git a/client/css/style.css b/client/css/style.css
index 0ce5b33..eb009b8 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -3,7 +3,6 @@ body {
 	font: 12px Consolas, monospace;
 	height: 100%;
 }
-
 a:focus {
 	outline: 0;
 }
@@ -162,9 +161,8 @@ h2 {
 	width: 160px;
 }
 #chat .users .user {
-	clear: both;
+	display: block;
 	color: #f00;
-	float: left;
 	padding: 0 8px;
 }
 #chat .messages {
@@ -220,8 +218,9 @@ h2 {
 	}
 	#chat .toggle {
 		background: #f00;
-		display: inherit;
+		display: block;
 		font-size: 14px;
+		position: relative;
 	}
 	#chat .toggle a {
 		color: #000;
@@ -230,7 +229,6 @@ h2 {
 		width: 46px;
 		position: absolute;
 		text-align: center;
-		z-index: 9999;
 	}
 	#chat .toggle .left {
 		border-left: 0;
@@ -249,6 +247,7 @@ h2 {
 		display: inherit;
 	}
 	#chat .title {
+		padding: 0;
 		text-align: center;
 	}
 	#chat .title .btn {
diff --git a/client/index.html b/client/index.html
index 45f4882..f734a92 100644
--- a/client/index.html
+++ b/client/index.html
@@ -80,11 +80,11 @@
 	<script type="text/html" id="window">
 	{{#channels}}
 	<div class="window {{type}}" data-id="{{id}}">
-		<div class="toggle">
-			<a href="#" class="left"><i class="fa fa-toggle-right"></i></a>
-			<a href="#" class="right"><i class="fa fa-toggle-left"></i></a>
-		</div>
 		<div class="title">
+			<div class="toggle">
+				<a href="#" class="left"><i class="fa fa-toggle-right"></i></a>
+				<a href="#" class="right"><i class="fa fa-toggle-left"></i></a>
+			</div>
 			<h1>{{name}}</h1>
 			<button class="close btn btn-danger btn-sm ">Leave</button>
 		</div>
diff --git a/client/js/chat.js b/client/js/chat.js
index fc0ccdc..e5698b5 100644
--- a/client/js/chat.js
+++ b/client/js/chat.js
@@ -202,9 +202,9 @@ $(function() {
 	$.fn.bringToTop = function() {
 		return this.css('z-index', highest++)
 			.addClass("active")
-			//.find(".input")
-			//.focus()
-			//.end()
+			.find(".input")
+			.focus()
+			.end()
 			.siblings()
 			.removeClass("active")
 			.end();