diff --git a/app/components/no-builds.coffee b/app/components/no-builds.coffee
new file mode 100644
index 00000000..38e3b529
--- /dev/null
+++ b/app/components/no-builds.coffee
@@ -0,0 +1,5 @@
+`import Ember from 'ember'`
+
+NoBuildsComponent = Ember.Component.extend()
+
+`export default NoBuildsComponent`
diff --git a/app/templates/builds.hbs b/app/templates/builds.hbs
index ec885c71..e9cd7322 100644
--- a/app/templates/builds.hbs
+++ b/app/templates/builds.hbs
@@ -2,6 +2,8 @@
 {{!-- <table id="builds" class="list"> --}}
   {{#each controller as |build|}}
     {{builds-item build=build}}
+  {{else}}
+    {{no-builds}}
   {{/each}}
   {{#if displayShowMoreButton}}
     <p>
@@ -11,6 +13,7 @@
       {{/if}}
     </p>
   {{/if}}
+
 {{else}}
   {{loading-indicator}}
 {{/if}}
diff --git a/app/templates/builds/not-found.hbs b/app/templates/builds/not-found.hbs
index 35c85ad0..bd2b8add 100644
--- a/app/templates/builds/not-found.hbs
+++ b/app/templates/builds/not-found.hbs
@@ -1,63 +1 @@
-<div class="missing-notice">
-  <figure class="page-graphic">
-    <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-       viewBox="0 0 220.5 161.9" enable-background="new 0 0 220.5 161.9" xml:space="preserve">
-    <path fill="#F1EFEF" d="M186.4,161.9c11.4-16.5,18.1-36.5,18.1-58c0-56.5-45.8-102.2-102.2-102.2S0,47.4,0,103.9
-      c0,21.5,6.7,41.5,18.1,58H186.4z"/>
-    <path fill="#DEDCDB" d="M186.4,161.9c11.1-16.1,17.8-35.7,18-56.7H0c0.3,21,6.9,40.5,18,56.7H186.4z"/>
-    <path fill="#D6D2D1" d="M190.6,137.2l-57.9-3.2c-14-0.8-25.6,1.5-25.8,5.1c-0.2,3.6,11.1,7.2,25.1,8l57.9,3.2
-      c1.7,0.1,1.8,0.1,3.4,0.2c2.2-3.9,4.1-8,5.7-12.2C195.9,137.7,194.1,137.4,190.6,137.2z"/>
-    <path fill="#3A3532" d="M95.8,138.7c0,0-7.3-16.3-7.7-17.4c-0.9-2.4-3.1-6.3-7.6-6.3c-4.8,0-14.7-0.1-23.8-0.2v0c-0.2,0-0.5,0-0.7,0
-      c-0.2,0-0.5,0-0.7,0v0c-9.1,0.1-19.1,0.2-23.8,0.2c-4.3,0-6.5,3.7-7.5,6.1c-0.5,1.2-7.8,17.5-7.8,17.5s-2.5,9.2,15.2,9.2
-      c7.5,0,16.3-0.1,24.7-0.2c8.4,0.1,17.2,0.2,24.7,0.2C98.2,148,95.8,138.7,95.8,138.7z"/>
-    <g>
-      <path fill="#E46B25" d="M79.4,127.4c0,0-16.2-88.5-16.8-91.8c-0.5-3.3-1.4-3.1-1.4-3.1s-0.8,0-1.9,0l3.2,105.2
-        C77.9,136,79.4,127.4,79.4,127.4z"/>
-      <path fill="#F57E20" d="M51.8,32.6c-1.2,0.2-1.4,3-1.4,3l-17.3,92c0,0,3.2,10.7,23.9,10.5c2,0,3.9-0.1,5.6-0.3L59.3,32.6
-        C56.8,32.5,52.6,32.5,51.8,32.6z"/>
-    </g>
-    <path fill="#FFFFFF" d="M60.3,105.9c-13.3,1.2-21.1-2.5-22.1-5.7l-2.3,12.5c0.4,1.3,1.8,3.6,6.6,5c7.1,2,13.9,2.9,20.1,1.9
-      c6.2-1.1,13.4-3.3,13.9-7.5l0,0c-0.7-3.6-1.4-7.8-2.2-12.1C74.3,100.2,74.2,104.7,60.3,105.9z"/>
-    <path fill="#FFFFFF" d="M56.4,77.5c-10.8-0.2-12.7-1.7-13.4-2.8l-2.4,13c0.4,1.3,2.8,3.7,14.3,4.3c14.8,0.7,16.9-3.7,17.1-4.3
-      c-0.8-4.2-1.6-8.5-2.3-12.7l-0.1-0.1C69.6,74.8,67.9,77.7,56.4,77.5z"/>
-    <path fill="#FFFFFF" d="M48.2,47.1l-2.6,14c0.5,0.5,2.4,1.7,10.1,1.8c8.1,0.2,10.8-0.9,11.6-1.6c-1-5.3-1.8-10.1-2.6-14.1
-      c-0.4,0.2-2.4,0.9-7.6,0.9C51.6,48,48.9,47.8,48.2,47.1z"/>
-    <path fill="#F4F4F4" d="M61.5,105.8l0.4,13.9c0.2,0,0.4-0.1,0.7-0.1c6.2-1.1,13.4-3.3,13.9-7.5l0,0c-0.1-0.4-0.1-0.8-0.2-1.2
-      c-0.1-0.4-0.1-0.8-0.2-1.2c-0.2-0.9-0.3-1.9-0.5-2.9c-0.1-0.4-0.2-0.9-0.2-1.3c-0.3-1.7-0.6-3.4-1-5.3c0-0.1,0-0.2,0-0.3
-      c0-0.1,0-0.1,0-0.2C74.3,100.2,74.2,104.4,61.5,105.8z"/>
-    <path fill="#F4F4F4" d="M60.7,77.4l0.4,14.6c9.2-0.6,10.8-3.8,10.9-4.3c0-0.2-0.1-0.5-0.1-0.7c-0.3-1.8-0.7-3.7-1-5.5
-      c0-0.1-0.1-0.3-0.1-0.4c-0.4-2.1-0.8-4.1-1.1-6.1l-0.1-0.1C69.6,74.8,68.4,76.9,60.7,77.4z"/>
-    <path fill="#F4F4F4" d="M59.8,48l0.5,14.9c4.6-0.2,6.4-1,7-1.6c-0.1-0.3-0.1-0.6-0.2-0.8c0-0.2-0.1-0.3-0.1-0.5
-      c-0.1-0.4-0.2-0.8-0.2-1.2c-0.1-0.4-0.1-0.8-0.2-1.2c0-0.1,0-0.2,0-0.2c-0.1-0.5-0.2-1-0.3-1.6c0-0.2-0.1-0.4-0.1-0.6
-      c-0.1-0.5-0.2-0.9-0.3-1.4c0-0.1,0-0.2,0-0.3c-0.1-0.3-0.1-0.6-0.2-0.9c-0.1-0.3-0.1-0.6-0.2-0.9c-0.3-1.6-0.6-3.1-0.8-4.5
-      c0,0,0,0,0,0C64.4,47.4,63,47.9,59.8,48z"/>
-    <path fill="#3A3532" d="M130.4,72.3l22.8,11.4c0,0,7.4,2.1,4.3,10.3c-3.6,9.4-17.4,39.2-17.4,39.2s-1.9,2.8-4.6,3.5
-      s-28.4-0.5-28.4-0.5s-8.5-2.1-5.7-11.1c2.8-9,16.4-40.8,16.4-40.8S122.3,70.2,130.4,72.3z"/>
-    <g>
-      <path fill="#E46B25" d="M122.7,129.2c0,0,87.3,21.8,90.5,22.7c3.2,0.9,3.4,0,3.4,0s0.3-0.7,0.8-1.7l-97.1-40.6
-        C115.5,124.4,122.7,129.2,122.7,129.2z"/>
-      <path fill="#F57E20" d="M220.4,143.3c0.4-1.2-2.1-2.5-2.1-2.5L141.7,87c0,0-11-1.5-19.4,17.4c-0.8,1.9-1.5,3.6-2,5.2l97.1,40.6
-        C218.4,148,220.2,144.1,220.4,143.3z"/>
-    </g>
-    <path fill="#FFFFFF" d="M150.2,120.8c4.4-12.6,11-18.2,14.3-17.7l-10.4-7.3c-1.4-0.2-4.1,0.1-7.3,4c-4.8,5.6-8.4,11.4-10,17.5
-      c-1.6,6.1-2.6,13.6,1,15.8l0,0c3.6,0.9,7.7,1.9,12,3C149.5,135.9,145.5,133.9,150.2,120.8z"/>
-    <path fill="#FFFFFF" d="M177.7,129c4.7-9.7,6.8-10.9,8.1-11l-10.8-7.6c-1.4-0.1-4.6,1-9.8,11.3c-6.8,13.1-3.6,16.9-3.2,17.4
-      c4.2,1,8.4,2.1,12.6,3.1l0.2-0.1C174.7,142.1,172.7,139.4,177.7,129z"/>
-    <path fill="#FFFFFF" d="M208.7,134.1l-11.7-8.2c-0.7,0.2-2.5,1.5-5.8,8.4c-3.5,7.3-3.7,10.2-3.3,11.2c5.2,1.3,10,2.5,13.9,3.5
-      c0-0.4,0.2-2.6,2.4-7.3C206.5,136.8,207.8,134.5,208.7,134.1z"/>
-    <path fill="#F4F4F4" d="M149.8,122l-12.8-5.4c-0.1,0.2-0.1,0.4-0.2,0.6c-1.6,6.1-2.6,13.6,1,15.8l0,0c0.4,0.1,0.8,0.2,1.1,0.3
-      c0.4,0.1,0.8,0.2,1.1,0.3c0.9,0.2,1.9,0.5,2.8,0.7c0.4,0.1,0.9,0.2,1.3,0.3c1.7,0.4,3.4,0.9,5.2,1.3c0.1,0,0.2,0,0.3,0.1
-      c0.1,0,0.1,0,0.2,0C149.6,135.9,145.8,134,149.8,122z"/>
-    <path fill="#F4F4F4" d="M176,132.9l-13.4-5.6c-3.3,8.6-1,11.4-0.6,11.7c0.2,0.1,0.5,0.1,0.7,0.2c1.8,0.4,3.6,0.9,5.4,1.4
-      c0.1,0,0.3,0.1,0.4,0.1c2,0.5,4.1,1,6.1,1.5l0.2-0.1C174.7,142.1,173.2,140.1,176,132.9z"/>
-    <path fill="#F4F4F4" d="M203.1,144.2l-13.7-5.7c-1.7,4.3-1.8,6.2-1.5,7c0.3,0.1,0.6,0.1,0.8,0.2c0.2,0,0.3,0.1,0.5,0.1
-      c0.4,0.1,0.8,0.2,1.2,0.3c0.4,0.1,0.8,0.2,1.2,0.3c0.1,0,0.2,0,0.2,0.1c0.5,0.1,1,0.3,1.5,0.4c0.2,0,0.4,0.1,0.6,0.1
-      c0.5,0.1,0.9,0.2,1.4,0.3c0.1,0,0.2,0,0.3,0.1c0.3,0.1,0.6,0.1,0.9,0.2c0.3,0.1,0.6,0.2,0.9,0.2c1.6,0.4,3.1,0.8,4.5,1.1
-      c0,0,0,0,0,0C201.8,148.7,201.9,147.2,203.1,144.2z"/>
-    </svg>
-  </figure>
-
-  <h2 class="page-title">No builds for this repository</h2>
-  <p class="page-notice">Want to start testing this project on Travis CI?</p>
-  <a href="http://docs.travis-ci.com/user/getting-started/" class="button button--green">Read the Docs on Getting Started</a>
-</div>
+{{no-builds}}
\ No newline at end of file
diff --git a/app/templates/components/no-builds.hbs b/app/templates/components/no-builds.hbs
new file mode 100644
index 00000000..35c85ad0
--- /dev/null
+++ b/app/templates/components/no-builds.hbs
@@ -0,0 +1,63 @@
+<div class="missing-notice">
+  <figure class="page-graphic">
+    <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+       viewBox="0 0 220.5 161.9" enable-background="new 0 0 220.5 161.9" xml:space="preserve">
+    <path fill="#F1EFEF" d="M186.4,161.9c11.4-16.5,18.1-36.5,18.1-58c0-56.5-45.8-102.2-102.2-102.2S0,47.4,0,103.9
+      c0,21.5,6.7,41.5,18.1,58H186.4z"/>
+    <path fill="#DEDCDB" d="M186.4,161.9c11.1-16.1,17.8-35.7,18-56.7H0c0.3,21,6.9,40.5,18,56.7H186.4z"/>
+    <path fill="#D6D2D1" d="M190.6,137.2l-57.9-3.2c-14-0.8-25.6,1.5-25.8,5.1c-0.2,3.6,11.1,7.2,25.1,8l57.9,3.2
+      c1.7,0.1,1.8,0.1,3.4,0.2c2.2-3.9,4.1-8,5.7-12.2C195.9,137.7,194.1,137.4,190.6,137.2z"/>
+    <path fill="#3A3532" d="M95.8,138.7c0,0-7.3-16.3-7.7-17.4c-0.9-2.4-3.1-6.3-7.6-6.3c-4.8,0-14.7-0.1-23.8-0.2v0c-0.2,0-0.5,0-0.7,0
+      c-0.2,0-0.5,0-0.7,0v0c-9.1,0.1-19.1,0.2-23.8,0.2c-4.3,0-6.5,3.7-7.5,6.1c-0.5,1.2-7.8,17.5-7.8,17.5s-2.5,9.2,15.2,9.2
+      c7.5,0,16.3-0.1,24.7-0.2c8.4,0.1,17.2,0.2,24.7,0.2C98.2,148,95.8,138.7,95.8,138.7z"/>
+    <g>
+      <path fill="#E46B25" d="M79.4,127.4c0,0-16.2-88.5-16.8-91.8c-0.5-3.3-1.4-3.1-1.4-3.1s-0.8,0-1.9,0l3.2,105.2
+        C77.9,136,79.4,127.4,79.4,127.4z"/>
+      <path fill="#F57E20" d="M51.8,32.6c-1.2,0.2-1.4,3-1.4,3l-17.3,92c0,0,3.2,10.7,23.9,10.5c2,0,3.9-0.1,5.6-0.3L59.3,32.6
+        C56.8,32.5,52.6,32.5,51.8,32.6z"/>
+    </g>
+    <path fill="#FFFFFF" d="M60.3,105.9c-13.3,1.2-21.1-2.5-22.1-5.7l-2.3,12.5c0.4,1.3,1.8,3.6,6.6,5c7.1,2,13.9,2.9,20.1,1.9
+      c6.2-1.1,13.4-3.3,13.9-7.5l0,0c-0.7-3.6-1.4-7.8-2.2-12.1C74.3,100.2,74.2,104.7,60.3,105.9z"/>
+    <path fill="#FFFFFF" d="M56.4,77.5c-10.8-0.2-12.7-1.7-13.4-2.8l-2.4,13c0.4,1.3,2.8,3.7,14.3,4.3c14.8,0.7,16.9-3.7,17.1-4.3
+      c-0.8-4.2-1.6-8.5-2.3-12.7l-0.1-0.1C69.6,74.8,67.9,77.7,56.4,77.5z"/>
+    <path fill="#FFFFFF" d="M48.2,47.1l-2.6,14c0.5,0.5,2.4,1.7,10.1,1.8c8.1,0.2,10.8-0.9,11.6-1.6c-1-5.3-1.8-10.1-2.6-14.1
+      c-0.4,0.2-2.4,0.9-7.6,0.9C51.6,48,48.9,47.8,48.2,47.1z"/>
+    <path fill="#F4F4F4" d="M61.5,105.8l0.4,13.9c0.2,0,0.4-0.1,0.7-0.1c6.2-1.1,13.4-3.3,13.9-7.5l0,0c-0.1-0.4-0.1-0.8-0.2-1.2
+      c-0.1-0.4-0.1-0.8-0.2-1.2c-0.2-0.9-0.3-1.9-0.5-2.9c-0.1-0.4-0.2-0.9-0.2-1.3c-0.3-1.7-0.6-3.4-1-5.3c0-0.1,0-0.2,0-0.3
+      c0-0.1,0-0.1,0-0.2C74.3,100.2,74.2,104.4,61.5,105.8z"/>
+    <path fill="#F4F4F4" d="M60.7,77.4l0.4,14.6c9.2-0.6,10.8-3.8,10.9-4.3c0-0.2-0.1-0.5-0.1-0.7c-0.3-1.8-0.7-3.7-1-5.5
+      c0-0.1-0.1-0.3-0.1-0.4c-0.4-2.1-0.8-4.1-1.1-6.1l-0.1-0.1C69.6,74.8,68.4,76.9,60.7,77.4z"/>
+    <path fill="#F4F4F4" d="M59.8,48l0.5,14.9c4.6-0.2,6.4-1,7-1.6c-0.1-0.3-0.1-0.6-0.2-0.8c0-0.2-0.1-0.3-0.1-0.5
+      c-0.1-0.4-0.2-0.8-0.2-1.2c-0.1-0.4-0.1-0.8-0.2-1.2c0-0.1,0-0.2,0-0.2c-0.1-0.5-0.2-1-0.3-1.6c0-0.2-0.1-0.4-0.1-0.6
+      c-0.1-0.5-0.2-0.9-0.3-1.4c0-0.1,0-0.2,0-0.3c-0.1-0.3-0.1-0.6-0.2-0.9c-0.1-0.3-0.1-0.6-0.2-0.9c-0.3-1.6-0.6-3.1-0.8-4.5
+      c0,0,0,0,0,0C64.4,47.4,63,47.9,59.8,48z"/>
+    <path fill="#3A3532" d="M130.4,72.3l22.8,11.4c0,0,7.4,2.1,4.3,10.3c-3.6,9.4-17.4,39.2-17.4,39.2s-1.9,2.8-4.6,3.5
+      s-28.4-0.5-28.4-0.5s-8.5-2.1-5.7-11.1c2.8-9,16.4-40.8,16.4-40.8S122.3,70.2,130.4,72.3z"/>
+    <g>
+      <path fill="#E46B25" d="M122.7,129.2c0,0,87.3,21.8,90.5,22.7c3.2,0.9,3.4,0,3.4,0s0.3-0.7,0.8-1.7l-97.1-40.6
+        C115.5,124.4,122.7,129.2,122.7,129.2z"/>
+      <path fill="#F57E20" d="M220.4,143.3c0.4-1.2-2.1-2.5-2.1-2.5L141.7,87c0,0-11-1.5-19.4,17.4c-0.8,1.9-1.5,3.6-2,5.2l97.1,40.6
+        C218.4,148,220.2,144.1,220.4,143.3z"/>
+    </g>
+    <path fill="#FFFFFF" d="M150.2,120.8c4.4-12.6,11-18.2,14.3-17.7l-10.4-7.3c-1.4-0.2-4.1,0.1-7.3,4c-4.8,5.6-8.4,11.4-10,17.5
+      c-1.6,6.1-2.6,13.6,1,15.8l0,0c3.6,0.9,7.7,1.9,12,3C149.5,135.9,145.5,133.9,150.2,120.8z"/>
+    <path fill="#FFFFFF" d="M177.7,129c4.7-9.7,6.8-10.9,8.1-11l-10.8-7.6c-1.4-0.1-4.6,1-9.8,11.3c-6.8,13.1-3.6,16.9-3.2,17.4
+      c4.2,1,8.4,2.1,12.6,3.1l0.2-0.1C174.7,142.1,172.7,139.4,177.7,129z"/>
+    <path fill="#FFFFFF" d="M208.7,134.1l-11.7-8.2c-0.7,0.2-2.5,1.5-5.8,8.4c-3.5,7.3-3.7,10.2-3.3,11.2c5.2,1.3,10,2.5,13.9,3.5
+      c0-0.4,0.2-2.6,2.4-7.3C206.5,136.8,207.8,134.5,208.7,134.1z"/>
+    <path fill="#F4F4F4" d="M149.8,122l-12.8-5.4c-0.1,0.2-0.1,0.4-0.2,0.6c-1.6,6.1-2.6,13.6,1,15.8l0,0c0.4,0.1,0.8,0.2,1.1,0.3
+      c0.4,0.1,0.8,0.2,1.1,0.3c0.9,0.2,1.9,0.5,2.8,0.7c0.4,0.1,0.9,0.2,1.3,0.3c1.7,0.4,3.4,0.9,5.2,1.3c0.1,0,0.2,0,0.3,0.1
+      c0.1,0,0.1,0,0.2,0C149.6,135.9,145.8,134,149.8,122z"/>
+    <path fill="#F4F4F4" d="M176,132.9l-13.4-5.6c-3.3,8.6-1,11.4-0.6,11.7c0.2,0.1,0.5,0.1,0.7,0.2c1.8,0.4,3.6,0.9,5.4,1.4
+      c0.1,0,0.3,0.1,0.4,0.1c2,0.5,4.1,1,6.1,1.5l0.2-0.1C174.7,142.1,173.2,140.1,176,132.9z"/>
+    <path fill="#F4F4F4" d="M203.1,144.2l-13.7-5.7c-1.7,4.3-1.8,6.2-1.5,7c0.3,0.1,0.6,0.1,0.8,0.2c0.2,0,0.3,0.1,0.5,0.1
+      c0.4,0.1,0.8,0.2,1.2,0.3c0.4,0.1,0.8,0.2,1.2,0.3c0.1,0,0.2,0,0.2,0.1c0.5,0.1,1,0.3,1.5,0.4c0.2,0,0.4,0.1,0.6,0.1
+      c0.5,0.1,0.9,0.2,1.4,0.3c0.1,0,0.2,0,0.3,0.1c0.3,0.1,0.6,0.1,0.9,0.2c0.3,0.1,0.6,0.2,0.9,0.2c1.6,0.4,3.1,0.8,4.5,1.1
+      c0,0,0,0,0,0C201.8,148.7,201.9,147.2,203.1,144.2z"/>
+    </svg>
+  </figure>
+
+  <h2 class="page-title">No builds for this repository</h2>
+  <p class="page-notice">Want to start testing this project on Travis CI?</p>
+  <a href="http://docs.travis-ci.com/user/getting-started/" class="button button--green">Read the Docs on Getting Started</a>
+</div>
diff --git a/tests/unit/components/no-builds-test.coffee b/tests/unit/components/no-builds-test.coffee
new file mode 100644
index 00000000..c792f42a
--- /dev/null
+++ b/tests/unit/components/no-builds-test.coffee
@@ -0,0 +1,17 @@
+`import { test, moduleForComponent } from 'ember-qunit'`
+
+moduleForComponent 'no-builds', {
+  # specify the other units that are required for this test
+  # needs: ['component:foo', 'helper:bar']
+}
+
+test 'it renders', (assert) ->
+  assert.expect 2
+
+  # creates the component instance
+  component = @subject()
+  assert.equal component._state, 'preRender'
+
+  # renders the component to the page
+  @render()
+  assert.equal component._state, 'inDOM'