diff --git a/assets/scripts/app/controllers/repos.coffee b/assets/scripts/app/controllers/repos.coffee
index 6fb3d02e..0f8c95e7 100644
--- a/assets/scripts/app/controllers/repos.coffee
+++ b/assets/scripts/app/controllers/repos.coffee
@@ -3,11 +3,23 @@ require 'travis/limited_array'
 Travis.ReposController = Ember.ArrayController.extend
   defaultTab: 'recent'
   isLoadedBinding: 'content.isLoaded'
+  needs: ['currentUser']
+  currentUserBinding: 'controllers.currentUser'
 
   init: ->
     Ember.run.later(@updateTimes.bind(this), Travis.INTERVALS.updateTimes)
     @_super.apply this, arguments
 
+  recentRepos: (->
+    Travis.LimitedArray.create
+      content: Em.ArrayProxy.extend(Em.SortableMixin).create(
+        sortProperties: ['sortOrder']
+        content: Travis.Repo.find()
+        isLoadedBinding: 'content.isLoaded'
+      )
+      limit: 30
+  ).property()
+
   updateTimes: ->
     if content = @get('content')
       content.forEach (r) -> r.updateTimes()
@@ -20,18 +32,10 @@ Travis.ReposController = Ember.ArrayController.extend
     this["view#{$.camelize(tab)}"](params)
 
   viewRecent: ->
-    return if @get('content')
-    content = Travis.LimitedArray.create
-      content: Em.ArrayProxy.extend(Em.SortableMixin).create(
-        sortProperties: ['sortOrder']
-        content: Travis.Repo.find()
-        isLoadedBinding: 'content.isLoaded'
-      )
-      limit: 30
-    @set('content', content)
+    @set('content', @get('recentRepos'))
 
   viewOwned: ->
-    @set('content', Travis.Repo.accessibleBy(Travis.app.get('currentUser.login')))
+    @set('content', Travis.Repo.accessibleBy(@get('currentUser.login')))
 
   viewSearch: (params) ->
     @set('content', Travis.Repo.search(params.search))
diff --git a/assets/scripts/app/pusher.coffee b/assets/scripts/app/pusher.coffee
index 2c5c757f..bd4a3e22 100644
--- a/assets/scripts/app/pusher.coffee
+++ b/assets/scripts/app/pusher.coffee
@@ -46,7 +46,7 @@ $.extend Travis.Pusher.prototype,
         Travis.Job.find(data.job.id).clearLog()
 
     Ember.run.next ->
-      Travis.app.store.receive(event, data)
+      Travis.store.receive(event, data)
 
   normalize: (event, data) ->
     switch event
diff --git a/assets/scripts/app/templates/auth/signin.hbs b/assets/scripts/app/templates/auth/signin.hbs
index a5609048..867fa2b5 100644
--- a/assets/scripts/app/templates/auth/signin.hbs
+++ b/assets/scripts/app/templates/auth/signin.hbs
@@ -6,6 +6,6 @@
 {{else}}
   <h1>Sign in</h1>
   <p>
-    <a href="#" {{action signIn target="Travis.app"}}>Please sign in with GitHub.</a>
+    <a href="#" {{action signIn target="Travis"}}>Please sign in with GitHub.</a>
   </p>
 {{/if}}
diff --git a/assets/scripts/app/templates/layouts/profile.hbs b/assets/scripts/app/templates/layouts/profile.hbs
index dfd3d499..53b66ed7 100644
--- a/assets/scripts/app/templates/layouts/profile.hbs
+++ b/assets/scripts/app/templates/layouts/profile.hbs
@@ -18,7 +18,7 @@
     </a>
   </div>
 
-  <div id="slider" {{action toggle target="Travis.app.slider"}}>
+  <div id="slider" {{action toggle target="Travis.slider"}}>
     <div class='icon'></div>&nbsp;
   </div>
 
diff --git a/assets/scripts/app/templates/layouts/sidebar.hbs b/assets/scripts/app/templates/layouts/sidebar.hbs
index 188c02f5..9383426f 100644
--- a/assets/scripts/app/templates/layouts/sidebar.hbs
+++ b/assets/scripts/app/templates/layouts/sidebar.hbs
@@ -4,7 +4,7 @@
   </a>
 </div>
 
-<div id="slider" {{action toggle target="Travis.app.slider"}}>
+<div id="slider" {{action toggle target="Travis.slider"}}>
   <div class='icon'></div>&nbsp;
 </div>
 
diff --git a/assets/scripts/app/templates/repos/list/tabs.hbs b/assets/scripts/app/templates/repos/list/tabs.hbs
index 11d02f66..ee9846cc 100644
--- a/assets/scripts/app/templates/repos/list/tabs.hbs
+++ b/assets/scripts/app/templates/repos/list/tabs.hbs
@@ -10,4 +10,4 @@
   </li>
 
   <a {{action toggleInfo target="view"}} class="toggle-info"></a>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/assets/scripts/app/views/job.coffee b/assets/scripts/app/views/job.coffee
index 68c27319..e78ca0f5 100644
--- a/assets/scripts/app/views/job.coffee
+++ b/assets/scripts/app/views/job.coffee
@@ -89,7 +89,7 @@
 
       if target.is('a') && target.attr('id') && target.attr('id').match(/^L\d+$/)
         path = target.attr 'href'
-        Travis.app.get('router').route(path)
+        Travis.get('router').route(path)
         event.stopPropagation()
         return false
 
@@ -126,7 +126,7 @@
       @set 'logManager', Travis.Log.create(target: this)
 
     toggleTailing: ->
-      Travis.app.tailing.toggle()
+      Travis.tailing.toggle()
       event.preventDefault()
 
     didInsertElement: ->
diff --git a/assets/scripts/app/views/left.coffee b/assets/scripts/app/views/left.coffee
index ced9bac4..f79cf82a 100644
--- a/assets/scripts/app/views/left.coffee
+++ b/assets/scripts/app/views/left.coffee
@@ -10,9 +10,9 @@
     classOwned: (->
       classes = []
       classes.push('active')  if @get('tab') == 'owned'
-      classes.push('display') if Travis.app.get('currentUser')
+      classes.push('display') if @get('controller.currentUser')
       classes.join(' ')
-    ).property('tab', 'Travis.currentUser')
+    ).property('tab', 'controller.currentUser')
 
     classSearch: (->
       'active' if @get('tab') == 'search'
diff --git a/assets/scripts/app/views/repo/list.coffee b/assets/scripts/app/views/repo/list.coffee
index f07094f2..716be416 100644
--- a/assets/scripts/app/views/repo/list.coffee
+++ b/assets/scripts/app/views/repo/list.coffee
@@ -22,8 +22,7 @@
   ReposListTabsView: Travis.View.extend
     templateName: 'repos/list/tabs'
     tabBinding: 'controller.tab'
-    needs: ['currentUser']
-    currentUserBinding: 'controllers.currentUser'
+    currentUserBinding: 'controller.currentUser'
 
     activate: ->
       @get('controller').activate(event.target.name)