diff --git a/css/glowingbear.css b/css/glowingbear.css
index 05ecc80..17f44dc 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -175,10 +175,17 @@ input[type=text], input[type=password], .badge {
     min-height: 100%;
     height: 100%;
     overflow-y: auto;
+    overflow-x: hidden;
     right: 0;
     top: 0;
-    padding-top: 35px; /* topbar */
-  }
+    padding-top: 25px; 
+    padding-left: 5px;
+    padding-bottom: 35px;
+}
+    #nicklist ul {
+        padding: 0;
+        margin: 0;
+    }
 .nav-pills > li > a {
     border-radius: 0;
     color: #ddd;
@@ -207,7 +214,7 @@ input[type=text], input[type=password], .badge {
 }
 
 .navbar-fixed-bottom {
-    margin: 0 5px 0 14%;
+    margin: 0 105px 0 14%;
 }
 .navbar-inverse {
     background-color: #181818;
diff --git a/index.html b/index.html
index b94c537..908ed18 100644
--- a/index.html
+++ b/index.html
@@ -146,7 +146,7 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
       </div>
     </div>
     <div class="content" ng-show="connected">
-      <div id="topbar" class="horizontal-line">
+      <div id="topbar" class="">
             <div class="brand">
               <img alt="brand" src="img/favicon.png">
             </div>
@@ -190,6 +190,16 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
                       </div>
                     </form>
                   </li>
+                  <li class="">
+                    <form class="form-inline" role="form">
+                      <div class="checkbox">
+                        <label>
+                          <input type="checkbox" ng-model="nonicklist">
+                          Hide nicklist
+                        </label>
+                      </div>
+                    </form>
+                  </li>
                 </ul>
               </div>
               <a ng-click="disconnect()">
@@ -213,14 +223,14 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
           </li>
         </ul>
       </div>
-      <div id="nicklist" class="">
-        <ul class="nicklistgroup list-unstyled" ng-repeat="group in activeBuffer().nicklist | toArray">
-          <li class="" ng-repeat="nick in group.nicks">
-            <a ng-click="nickAction(nick)"><span ng-class="nick.prefix_color">{{nick.prefix}}</span><span ng-class="color">{{nick.name}}</span></a>
-          </li>
-        </ul>
-      </div>
-      <div id="bufferlines" class="vertical-line">
+      <div id="bufferlines">
+        <div id="nicklist" ng-hide="nonicklist" class="vertical-line-left">
+          <ul class="nicklistgroup list-unstyled" ng-repeat="group in activeBuffer().nicklist | toArray">
+            <li class="" ng-repeat="nick in group.nicks">
+              <a ng-click="nickAction(nick)"><span ng-class="nick.prefix_color">{{nick.prefix}}</span><span ng-class="color">{{nick.name}}</span></a>
+            </li>
+          </ul>
+        </div>
         <table>
           <tbody>
             <tr class="bufferline" ng-repeat-start="bufferline in (bufferlines = activeBuffer().lines)">
diff --git a/js/models.js b/js/models.js
index c44823c..cae12fa 100644
--- a/js/models.js
+++ b/js/models.js
@@ -144,7 +144,9 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
         var prefix = message['prefix'];
         var visible = message['visible'];
         var name = message['name'];
+        /* TODO translate color to CSS value */
         var prefix_color = message['prefix_color'];
+        /* TODO translate color to CSS value */
         var color = message['color'];
 
         return {
diff --git a/js/websockets.js b/js/websockets.js
index 573f180..15aceee 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -455,6 +455,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     $store.bind($scope, "notimestamp", false);
     // Save setting for syncing hotlist
     $store.bind($scope, "hotlistsync", true);
+    // Save setting for displaying nicklist
+    $store.bind($scope, "nonicklist", false); 
 
 
     $scope.setActiveBuffer = function(key) {