diff --git a/assets/javascripts/app/app.coffee b/assets/javascripts/app/app.coffee
index 3e5a6094..2404a7e5 100644
--- a/assets/javascripts/app/app.coffee
+++ b/assets/javascripts/app/app.coffee
@@ -4,6 +4,8 @@ require 'hax0rs'
 # Ember.LOG_BINDINGS = true
 
 @Travis = Em.Namespace.create
+  CONFIG_KEYS: ['rvm', 'gemfile', 'env', 'otp_release', 'php', 'node_js', 'perl', 'python', 'scala']
+
   run: ->
     @app = Travis.App.create(this)
     @app.initialize()
@@ -18,7 +20,7 @@ require 'hax0rs'
 require 'ext/jquery'
 require 'controllers'
 require 'helpers'
-require 'layouts'
+require 'layout'
 require 'models'
 require 'router'
 require 'store'
diff --git a/assets/javascripts/app/controllers.coffee b/assets/javascripts/app/controllers.coffee
index 3950ab54..2b7a50c3 100644
--- a/assets/javascripts/app/controllers.coffee
+++ b/assets/javascripts/app/controllers.coffee
@@ -5,7 +5,7 @@ Travis.Controllers =
   RepositoriesController: Em.ArrayController.extend()
   RepositoryController:   Em.ObjectController.extend(Travis.Urls.Repository)
   TabsController:         Em.Controller.extend()
-  HistoryController:      Em.ArrayController.extend()
+  BuildsController:       Em.ArrayController.extend()
   BuildController:        Em.ObjectController.extend(Travis.Urls.Commit)
   JobController:          Em.ObjectController.extend(Travis.Urls.Commit)
 
diff --git a/assets/javascripts/app/models/build.coffee b/assets/javascripts/app/models/build.coffee
index ce21ed95..26aaf8ad 100644
--- a/assets/javascripts/app/models/build.coffee
+++ b/assets/javascripts/app/models/build.coffee
@@ -34,10 +34,9 @@ require 'travis/model'
   ).property('data.job_ids.length')
 
   configKeys: (->
-    config = @get('config')
-    return [] unless config
-    keys = $.keys($.only(config, 'rvm', 'gemfile', 'env', 'otp_release', 'php', 'node_js', 'perl', 'python', 'scala'))
-    headers = [I18n.t('build.job'), I18n.t('build.duration'), I18n.t('build.finished_at')]
+    return [] unless config = @get('config')
+    keys = $.intersect($.keys(config), Travis.CONFIG_KEYS)
+    headers = (I18n.t(key) for key in ['build.job', 'build.duration', 'build.finished_at'])
     $.map(headers.concat(keys), (key) -> return $.camelize(key))
   ).property('config')
 
diff --git a/assets/javascripts/app/views/build.coffee b/assets/javascripts/app/views/build.coffee
index 1921c7dc..f1684c3f 100644
--- a/assets/javascripts/app/views/build.coffee
+++ b/assets/javascripts/app/views/build.coffee
@@ -1,5 +1,5 @@
 @Travis.Views.reopen
-  HistoryView: Em.View.extend
+  BuildsView: Em.View.extend
     templateName: 'builds/list'
 
   BuildsItemView: Em.View.extend
diff --git a/assets/javascripts/lib/ext/jquery.coffee b/assets/javascripts/lib/ext/jquery.coffee
index 2f4f0678..665055f7 100644
--- a/assets/javascripts/lib/ext/jquery.coffee
+++ b/assets/javascripts/lib/ext/jquery.coffee
@@ -121,6 +121,10 @@ $.extend
       result[key] = object[key]  if keys.indexOf(key) is -1
     result
 
+  intersect: (array, other) ->
+    array.filter (element) ->
+      other.indexOf(element) != -1
+
   map: (elems, callback, arg) ->
     value = undefined
     key = undefined