diff --git a/assets/scripts/app/templates/repos/list.hbs b/assets/scripts/app/templates/repos/list.hbs
index 961db9b6..574414ba 100644
--- a/assets/scripts/app/templates/repos/list.hbs
+++ b/assets/scripts/app/templates/repos/list.hbs
@@ -7,27 +7,32 @@
 <div class="tab">
   {{#if isLoaded}}
     {{#collection 'repos-list' content=this}}
-      {{#with view.repo}}
+      {{#with view.repo as repo}}
         <div class="slug-and-status">
           <span class="status"></span>
-          {{#if slug}}
-            {{#link-to "repo" this class="slug"}}{{slug}}{{/link-to}}
+          {{#if repo.slug}}
+            {{#link-to "repo" repo class="slug"}}{{repo.slug}}{{/link-to}}
           {{/if}}
         </div>
-        {{#with lastBuildHash}}
+        {{#with repo.lastBuildHash as lastBuild}}
           {{#if repo.slug}}
-            {{#link-to "build" repo id class="last_build"}}{{number}}{{/link-to}}
+            {{#link-to "build" repo lastBuild.id
+            class="last_build"}}{{lastBuild.number}}{{/link-to}}
           {{/if}}
         {{/with}}
 
-        {{#if lastBuildHash.number }}
+        {{#if repo.lastBuildHash.number }}
         <p class="summary">
           <span class="duration_label">Duration:</span>
-          <abbr class="duration" {{bind-attr title="lastBuildStartedAt"}}>{{formatDuration lastBuildDuration}}</abbr>
+          <abbr class="duration" {{bind-attr title="lastBuildStartedAt"}}>
+            {{formatDuration repo.lastBuildDuration}}
+          </abbr>
         </p>
         <p class="summary">
           <span class="finished-icon"></span><span class="finished_at_label">Finished:</span>
-          <abbr class="finished_at timeago" {{bind-attr title="lastBuildFinishedAt"}}>{{formatTime lastBuildFinishedAt}}</abbr>
+          <abbr class="finished_at timeago" {{bind-attr title="lastBuildFinishedAt"}}>
+            {{formatTime repo.lastBuildFinishedAt}}
+          </abbr>
         </p>
         {{/if}}
 
diff --git a/assets/scripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs
index b9de7359..5b359522 100644
--- a/assets/scripts/app/templates/repos/show.hbs
+++ b/assets/scripts/app/templates/repos/show.hbs
@@ -3,24 +3,22 @@
     {{view Travis.ReposEmptyView}}
   {{else}}
     {{#if repo.isLoaded}}
-      {{#with repo}}
-        <div id="repo-header">
-          <h3>{{#link-to "repo" this}}{{slug}}{{/link-to}}</h3>
-          <div class="github-icon"><a {{bind-attr href="controller.urlGithub"}}><img src="/images/icons/github.svg" width="21" height="21"/></a></div>
-          <div class="status-image">
-            <a href="#" id="status-image-popup" name="status-images" class="open-popup" {{action "statusImages" target="view"}}>
-            <img {{bind-attr src="view.statusImageUrl"}} title="Build Status Images"/>
-            </a>
-          </div>
-
-          {{view 'repo-show-tools'}}
+      <div id="repo-header">
+        <h3>{{#link-to "repo" repo}}{{repo.slug}}{{/link-to}}</h3>
+        <div class="github-icon"><a {{bind-attr href="controller.urlGithub"}}><img src="/images/icons/github.svg" width="21" height="21"/></a></div>
+        <div class="status-image">
+          <a href="#" id="status-image-popup" name="status-images" class="open-popup" {{action "statusImages" target="view"}}>
+          <img {{bind-attr src="view.statusImageUrl"}} title="Build Status Images"/>
+          </a>
         </div>
 
-        <p class="description">{{description}}</p>
+        {{view 'repo-show-tools'}}
+      </div>
 
-        {{view 'repo-show-tabs'}}
-        {{view 'repo-actions'}}
-      {{/with}}
+      <p class="description">{{description}}</p>
+
+      {{view 'repo-show-tabs'}}
+      {{view 'repo-actions'}}
 
       <div class="tab">
         {{outlet}}