diff --git a/css/glowingbear.css b/css/glowingbear.css
index d013eee..1902717 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -1,3 +1,5 @@
+html {
+}
 body {
     color: white;
     background-color: #222;
@@ -6,10 +8,14 @@ body {
     padding-bottom:70px;
     padding-top: 70px;
 }
+.content {
+    height: 100%; 
+    min-height: 100%; 
+    display: block;
+}
 .bufferlines {
     font-family: monospace;
-    overflow: scroll-y;
-    height: 100%; 
+    overflow-y: auto;
 }
 
 .navbar-fixed-bottom {
diff --git a/index.html b/index.html
index 051a724..a750669 100644
--- a/index.html
+++ b/index.html
@@ -69,7 +69,7 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
           <button class="btn btn-lg btn-primary" ng-click="connect()">Connect!</button>
         </form>
       </div>
-      <div ng-show="connected">
+      <div class="content" ng-show="connected">
         <nav class="navbar navbar-default navbar-inverse navbar-fixed-top" role="navigation">
           <div class="navbar-header">
             <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
diff --git a/js/websockets.js b/js/websockets.js
index 9b5d36f..b10cde9 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -270,7 +270,7 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'pluginManager', function($
 
     var handleLine = function(line, initial) {
         var buffer_line = {}
-        var date = line['date'];
+        var date = line['date']*1000;
         var prefix = colors.parse(line['prefix']);
         var text = colors.parse(line['message']);
         var buffer = line['buffer'];
@@ -306,7 +306,7 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'pluginManager', function($
               }
             }
 
-            $rootScope.buffers[buffer]['lines'].push(buffer_line);
+            $rootScope.addLine(buffer, buffer_line);
 
             buffer_line['date'] = date;
 
@@ -553,8 +553,29 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', 'connection
         $rootScope.buffers[key]['unread'] = '';
         $rootScope.activeBuffer = $rootScope.buffers[key];
         $rootScope.pageTitle = $rootScope.activeBuffer['short_name'] + ' | ' + $rootScope.activeBuffer['title'];
+        $rootScope.scrollToBottom();
     };
 
+    $rootScope.$watch('activeBuffer', function(newVal, oldVal) {
+        if (newVal && newVal !== oldVal) { 
+            $rootScope.scrollToBottom();
+        }
+    });
+
+    $rootScope.addLine = function(buffer, line) {
+        $rootScope.buffers[buffer]['lines'].push(line);
+        // Scroll if needed
+        if ($rootScope.activeBuffer['id'] == buffer) {
+            $rootScope.scrollToBottom();
+        }
+    }
+
+    $rootScope.scrollToBottom = function() {
+        setTimeout(function() {
+            window.scrollTo(0, window.scrollMaxY);
+        });
+    }
+
     $scope.sendMessage = function() {
         connection.sendMessage($scope.command);
         $scope.command = "";
@@ -565,7 +586,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', 'connection
     }
     $rootScope.getLines = function() {
       var count = 20;
-      connection.getLines(20);
+      connection.getLines(count);
     }
 
     /* Function gets called from bufferLineAdded code if user should be notified */