diff --git a/html/main.html b/html/main.html
index 90fb1823..1ebcaef6 100644
--- a/html/main.html
+++ b/html/main.html
@@ -38,7 +38,7 @@
 </div>
 <div class="ng-cloak nicescroll" id="rightslide" ng-show="roomstatus">
     <div class="rightslidepane">
-        <div id="buddylist"><buddy-list/></div>
+        <div id="buddylist" ng-mouseenter="toggleBuddylist(true)" ng-mouseleave="toggleBuddylist(false)"><buddy-list/></div>
         <div id="chat"><chat/></div>
     </div>
 </div>
diff --git a/src/styles/components/_buddylist.scss b/src/styles/components/_buddylist.scss
index ebe9d802..96b8985d 100644
--- a/src/styles/components/_buddylist.scss
+++ b/src/styles/components/_buddylist.scss
@@ -24,6 +24,26 @@ top: 0px;
 right: 0px;
 bottom: 0px;
 width:285px;
+pointer-events:auto;
+}
+#buddylist:before {
+position:absolute;
+width:25px;
+height:25px;
+margin: auto;
+left: 0px;
+top:0px;
+bottom:0px;
+content:"\f100";
+font-family: 'FontAwesome';
+color:#ccc;
+font-size:1.8em;
+text-align:center;
+cursor:pointer;
+text-shadow: 0 0 5px black;
+}
+.withBuddylist #buddylist:before {
+display:none;
 }
 .buddylist {
 position:absolute;
@@ -126,7 +146,6 @@ background:rgba(255,255,255,0.5);
 z-index:5;
 line-height:66px;
 padding:0 10px;
-/*width:110px;*/
 transition-property: right;
 -webkit-transition-property: right;
 transition-duration: .3s;
@@ -140,16 +159,3 @@ font-size:2em;
 .buddy.hovered .buddyactions {
 right:0px;
 }
-
-@media only screen and (max-width: 400px) {
-	#buddylist {
-		left:0px;
-		width:auto;
-		margin-bottom:26px;
-	}
-	.buddylist .buddylistempty {
-		background: transparent;
-		color:#ccc;
-		padding-top:14px;
-	}
-}
\ No newline at end of file
diff --git a/src/styles/components/_roombar.scss b/src/styles/components/_roombar.scss
index ce07763a..ae94b21d 100644
--- a/src/styles/components/_roombar.scss
+++ b/src/styles/components/_roombar.scss
@@ -25,6 +25,7 @@
 	right:3px;
 	height:32px;
 	color:#ccc;
+	text-shadow: 0 0 5px black;
 	z-index:4;
 }
 #roombar .roombar {
diff --git a/static/js/controllers/mediastreamcontroller.js b/static/js/controllers/mediastreamcontroller.js
index 29c10a66..486762af 100644
--- a/static/js/controllers/mediastreamcontroller.js
+++ b/static/js/controllers/mediastreamcontroller.js
@@ -316,6 +316,18 @@ define(['underscore', 'bigscreen', 'moment', 'webrtc.adapter'], function(_, BigS
 
         };
 
+        $scope.toggleBuddylist = (function() {
+            var oldState = null;
+            return function(status, force) {
+                if (status || force) {
+                    oldState = $scope.showBuddylist;
+                    $scope.showBuddylist = !!status;
+                } else {
+                    $scope.showBuddylist = oldState;
+                }
+            }
+        }());
+
         $scope.$watch("cameraMute", function(cameraMute) {
             mediaStream.webrtc.setVideoMute(cameraMute);
         });
diff --git a/static/js/directives/audiovideo.js b/static/js/directives/audiovideo.js
index b5d600b9..01478cea 100644
--- a/static/js/directives/audiovideo.js
+++ b/static/js/directives/audiovideo.js
@@ -343,7 +343,6 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
 
                 $($window).on("resize", scope.resize);
                 scope.$on("mainresize", function() {
-                    console.log("mainResize called");
                     _.defer(scope.resize);
                 });
                 scope.resize();