diff --git a/client/css/style.css b/client/css/style.css
index 7f70f99e..2af34d74 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -103,6 +103,25 @@ button {
 	-webkit-perspective: 1000;
 	        perspective: 1000;
 }
+#viewport .lt,
+#viewport .rt {
+	color: #ccc;
+	display: none;
+	float: left;
+	line-height: 40px;
+	height: 36px;
+	margin: 6px 12px 0 -12px;
+	width: 36px;
+}
+#viewport .lt:before,
+#viewport .rt:before {
+	font: 14px FontAwesome;
+	content: "\f0c9";
+}
+#viewport .rt {
+	float: right;
+	margin: 6px -12px 0 12px;
+}
 #sidebar {
 	bottom: 0;
 	left: 0;
@@ -351,6 +370,10 @@ button {
 #windows .active {
 	display: block;
 }
+#windows .window .lt {
+	margin-top: 4px;
+	margin-left: 8px;
+}
 #chat {
 	bottom: 0;
 	font: 13px Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace;
@@ -368,25 +391,6 @@ button {
 	height: 48px;
 	padding: 0 20px;
 }
-#chat .header .lt,
-#chat .header .rt {
-	color: #ccc;
-	display: none;
-	float: left;
-	line-height: 40px;
-	height: 36px;
-	margin: 6px 12px 0 -12px;
-	width: 36px;
-}
-#chat .header .lt:before,
-#chat .header .rt:before {
-	font: 14px FontAwesome;
-	content: "\f0c9";
-}
-#chat .header .rt {
-	float: right;
-	margin: 6px -12px 0 12px;
-}
 #chat .header .title {
 	font: 16px Lato;
 }
@@ -698,8 +702,8 @@ button {
 	#chat .chat {
 		right: 0;
 	}
-	#chat .header .lt,
-	#chat .channel .header .rt {
+	#viewport .lt,
+	#viewport .channel .rt {
 		display: block;
 	}
 	#chat .sidebar {
diff --git a/client/index.html b/client/index.html
index b9fa80b2..36f7ae4a 100644
--- a/client/index.html
+++ b/client/index.html
@@ -35,6 +35,7 @@
 			<div id="windows">
 				<div id="chat"></div>
 				<div id="sign-in" class="window">
+					<button class="lt"></button>
 					<form class="container" action="">
 						<div class="row">
 							<div class="col-xs-12">
@@ -64,6 +65,7 @@
 					</form>
 				</div>
 				<div id="connect" class="window">
+					<button class="lt"></button>
 					<form class="container" action="">
 						<div class="row">
 							<div class="col-xs-12">
@@ -118,6 +120,7 @@
 					</form>
 				</div>
 				<div id="settings" class="window">
+					<button class="lt"></button>
 					<div class="container">
 						<div class="row">
 							<div class="col-sm-12">
diff --git a/client/js/shout.js b/client/js/shout.js
index 880a32f2..40ad2899 100644
--- a/client/js/shout.js
+++ b/client/js/shout.js
@@ -332,10 +332,8 @@ $(function() {
 		}
 
 		viewport.removeClass();
-
 		var active = $("#windows .active").removeClass("active");
-
-		if (active.attr('id') == 'sign-in') {
+		if (active.attr("id") == "sign-in") {
 			active.detach();
 		}
 
diff --git a/package.json b/package.json
index ff6c2335..14711c1e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shout",
   "description": "A web IRC client",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "author": "Mattias Erming",
   "preferGlobal": true,
   "bin": {