diff --git a/www/assets/css/ytsync.css b/www/assets/css/ytsync.css
index 28228480..101575e8 100644
--- a/www/assets/css/ytsync.css
+++ b/www/assets/css/ytsync.css
@@ -29,6 +29,7 @@
 }
 
 .qe_time {
+    font-family: Monospace;
     float: right;
 }
 
@@ -36,8 +37,10 @@
     clear: both;
 }
 
-#library {
-    width: 640px;
+#usercount, #currenttitle {
+    border: 1px solid #aaaaaa;
+    border-bottom: none;
+    margin: 0;
 }
 
 #userlist {
@@ -47,6 +50,7 @@
     float: left;
     width: 150px;
     border: 1px solid #aaaaaa; // [](/z13)
+    border-left: none;
 }
 
 #messagebuffer {
@@ -64,11 +68,6 @@
     word-wrap: break-word; /* Internet Explorer 5.5+ */
 }
 
-#chatline {
-    /*width: 456px;*/
-    width: 100%;
-}
-
 .userlist_siteadmin {
     color: #cc0000;
     font-weight: bold;
@@ -83,6 +82,10 @@
     color: #00aa00;
 }
 
+.userlist_guest {
+    color: #aaaaaa;
+}
+
 .action {
     font-style: italic;
     color: #888888;
diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index 15b712f7..9595c7e9 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -355,11 +355,11 @@ function largeLayout() {
     $("#ytapiplayer").attr("width", "770").attr("height", "430");
     var chat = $("#chatdiv").detach();
     $("#layoutrow").remove();
-    var r = $("<div />").addClass("row").insertAfter($(".row")[1]);
+    var r = $("<div />").addClass("row").insertAfter($("#videodiv").parent());
     r.attr("id", "layoutrow");
     chat.removeClass().addClass("span8 offset2").appendTo(r);
+    $("#chatline").removeClass().addClass("span8");
     $("#userlist").css("width", "200px");
-    //$("#chatline").css("width", "756px");
 }
 
 function hugeLayout() {
@@ -369,12 +369,12 @@ function hugeLayout() {
     $("#ytapiplayer").attr("width", "1170").attr("height", "658");
     var chat = $("#chatdiv").detach();
     $("#layoutrow").remove();
-    var r = $("<div />").addClass("row").insertAfter($(".row")[1]);
+    var r = $("<div />").addClass("row").insertAfter($("#videodiv").parent());
     r.attr("id", "layoutrow");
     chat.removeClass().addClass("span12").appendTo(r);
+    $("#chatline").removeClass().addClass("span12");
     $("#userlist").css("width", "200px").css("height", "200px");
     $("#messagebuffer").css("height", "200px");
-    //$("#chatline").css("width", "1156px");
 }
 
 function narrowLayout() {
@@ -384,11 +384,11 @@ function narrowLayout() {
     $("#ytapiplayer").attr("width", "570").attr("height", "321");
     var chat = $("#chatdiv").detach();
     $("#layoutrow").remove();
-    var r = $("<div />").addClass("row").insertAfter($(".row")[1]);
+    var r = $("<div />").addClass("row").insertAfter($("#videodiv").parent());
     r.attr("id", "layoutrow");
     chat.removeClass().addClass("span6").appendTo(r);
+    $("#chatline").removeClass().addClass("span6");
     $("#userlist").css("width", "150px");
-    //$("#chatline").css("width", "556px");
 }
 
 function synchtubeLayout() {
diff --git a/www/index.html b/www/index.html
index e2de7607..191433f4 100644
--- a/www/index.html
+++ b/www/index.html
@@ -63,7 +63,7 @@
                 </div>
                 <div id="messagebuffer">
                 </div>
-                <input type="text" id="chatline">
+                <input type="text" id="chatline" class="span5">
             </div>
             <div class="span7" id="videodiv">
                 <p id="currenttitle">Currently Playing: </p>
@@ -77,12 +77,10 @@
         </div>
         <div class="row" style="margin-top: 50px;">
             <div class="span6" id="queuediv">
-                <div id="playlist_controls" style="display: none;">
+                <div id="playlist_controls" class="input-append" style="display: none;">
                     <input type="text" id="mediaurl" style="margin:auto;">
-                    <div class="btn-group">
-                        <button class="btn" id="queue_next">Queue Next</button>
-                        <button class="btn" id="queue_end">Queue @ End</button>
-                    </div>
+                    <button class="btn" id="queue_next">Queue Next</button>
+                    <button class="btn" id="queue_end">Queue @ End</button>
                 </div>
                 <button class="btn btn-danger" id="voteskip">Voteskip</button>
                 <ul id="queue" class="videolist">
@@ -90,8 +88,8 @@
                 <button class="btn btn-danger" id="qlockbtn" style="width: 100%; display:none;">Unlock Queue</button>
             </div>
             <div class="span6" id="librarydiv">
-                <input type="text" id="library_query" style="margin:auto;">
-                <div class="btn-group">
+                <div class="input-append">
+                    <input type="text" id="library_query" style="margin:auto;">
                     <button class="btn" id="library_search">Search Library</button>
                     <button class="btn" id="youtube_search">Search YouTube</button>
                 </div>