diff --git a/www/waterfall_view/package.json b/www/waterfall_view/package.json
index f1401180f3a..36a48277341 100644
--- a/www/waterfall_view/package.json
+++ b/www/waterfall_view/package.json
@@ -1,10 +1,10 @@
 {
-    "name": "buildbot-console_view",
+    "name": "buildbot-waterfall_view",
     "engines": {
         "node": ">=0.10.20",
         "npm": ">=1.4.10"
     },
     "devDependencies": {
-        "guanlecoja": "0.2.10"
+        "guanlecoja": "^0.2.0"
     }
 }
diff --git a/www/waterfall_view/src/module/main.module.coffee b/www/waterfall_view/src/module/main.module.coffee
index 5b3966e16a7..ba56dd5e15e 100644
--- a/www/waterfall_view/src/module/main.module.coffee
+++ b/www/waterfall_view/src/module/main.module.coffee
@@ -60,9 +60,9 @@ class Waterfall extends Controller
             @dataService.addStatus(@builders)
 
             # Select containers
-            @container = @d3.select('.svg-container')
-            @header = @d3.select('.header-content')
             @waterfall = @d3.select('.waterfall')
+            @container = @waterfall.select('.svg-container')
+            @header = @waterfall.select('.header-content')
             # Append svg elements to the containers
             @createElements()
 
@@ -72,6 +72,12 @@ class Waterfall extends Controller
             @loading = false
 
             # Render on resize
+            @$scope.$watch(
+                => @waterfall.style('width')
+            ,
+                (n, o) => if n != o then @render()
+            , true
+            )
             angular.element(@$window).bind 'resize', => @render()
 
             # Update view on data change
@@ -138,7 +144,7 @@ class Waterfall extends Controller
         if @c.minColumnWidth > 0 and @c.maxColumnWidth > 0 and @c.minColumnWidth <= @c.maxColumnWidth
             columnWidth = (@$window.innerWidth - @c.margin.right - @c.margin.left) / @builders.length
 
-            narrower =  columnWidth <= @c.maxColumnWidth
+            narrower = columnWidth <= @c.maxColumnWidth
             wider = @c.minColumnWidth <= columnWidth
 
             width =
@@ -148,6 +154,9 @@ class Waterfall extends Controller
                 else
                     "#{@builders.length * @c.maxColumnWidth + @c.margin.right + @c.margin.left}px"
 
+            @waterfall.select('.inner-content').style('width', width)
+            @waterfall.select('.header-content').style('width', width)
+
         else
             @$log.error "Bad column width configuration\n\t min: #{@c.minColumnWidth}\n\t max: #{@c.maxColumnWidth}"
             width = 40
diff --git a/www/waterfall_view/src/styles/styles.less b/www/waterfall_view/src/styles/styles.less
index 8dd84af9c3a..3a9356f9094 100644
--- a/www/waterfall_view/src/styles/styles.less
+++ b/www/waterfall_view/src/styles/styles.less
@@ -217,4 +217,4 @@
       stroke: #EEEEEE;
     }
   }
-}
\ No newline at end of file
+}