diff --git a/app/components/dashboard-row.js b/app/components/dashboard-row.js
index bcc1ced5..96e6c625 100644
--- a/app/components/dashboard-row.js
+++ b/app/components/dashboard-row.js
@@ -3,7 +3,7 @@ import { githubCommit as githubCommitUrl } from 'travis/utils/urls';
 import config from 'travis/config/environment';
 import { hasAdminPermission, hasPushPermission } from 'travis/utils/permission';
 
-export default Ember.Component.extend(Permissions, {
+export default Ember.Component.extend({
   tagName: 'li',
   classNameBindings: ['repo.default_branch.last_build.state'],
   classNames: ['rows', 'rows--dashboard'],
diff --git a/app/templates/components/dashboard-row.hbs b/app/templates/components/dashboard-row.hbs
index d36d3c45..97ef60e4 100644
--- a/app/templates/components/dashboard-row.hbs
+++ b/app/templates/components/dashboard-row.hbs
@@ -23,10 +23,12 @@
         <h3 class="label">Default branch</h3>
         <p class="row-content color">
           {{request-icon event=repo.default_branch.last_build.event_type state=repo.default_branch.last_build.state}}
-          {{repo.default_branch.name}} is {{repo.default_branch.last_build.state}}
+          {{repo.default_branch.name}}
+          {{#if repo.default_branch.last_build.state}}is {{repo.default_branch.last_build.state}}{{/if}}
         </p>
       </section>
 
+{{#if repo.default_branch.last_build}}
       <section class="dash-last-build">
         <div>
           <h3 class="label">Last build</h3>
@@ -61,6 +63,7 @@
           </p>
         </div>
       </section>
+{{/if}}
 
       {{#if displayMenuTofu}}
         <div class="dash-menu">
diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs
index 70454b53..2b333daf 100644
--- a/app/templates/dashboard.hbs
+++ b/app/templates/dashboard.hbs
@@ -1,3 +1,3 @@
-{{#travis-layout layoutName="layouts/dashboard" class="dashboard"}}
+{{#travis-layout layoutName="layouts/simple" class="dashboard"}}
   {{outlet}}
 {{/travis-layout}}
diff --git a/app/templates/layouts/dashboard.hbs b/app/templates/layouts/dashboard.hbs
deleted file mode 100644
index 822fa81d..00000000
--- a/app/templates/layouts/dashboard.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="wrapper">
-  <header id="top" class="top">
-    <div class="centered">
-      {{render "top"}}
-    </div>
-  </header>
-
-  <div class="centered">
-    {{yield}}
-  </div>
-</div>
-
-<footer>
-  {{render "footer"}}
-</footer>
diff --git a/app/templates/layouts/profile.hbs b/app/templates/layouts/profile.hbs
index 33ed9f24..6b110e90 100644
--- a/app/templates/layouts/profile.hbs
+++ b/app/templates/layouts/profile.hbs
@@ -15,6 +15,4 @@
   </div>
 </div>
 
-<footer>
-  {{render "footer"}}
-</footer>
+{{render "footer"}}
diff --git a/app/templates/layouts/simple.hbs b/app/templates/layouts/simple.hbs
index f47a6b5b..3a98e1e4 100644
--- a/app/templates/layouts/simple.hbs
+++ b/app/templates/layouts/simple.hbs
@@ -13,6 +13,4 @@
   </div>
 </div>
 
-<footer>
-  {{render "footer"}}
-</footer>
+{{render "footer"}}
diff --git a/app/templates/owner.hbs b/app/templates/owner.hbs
index 95844a0a..84bc176c 100644
--- a/app/templates/owner.hbs
+++ b/app/templates/owner.hbs
@@ -1,4 +1,4 @@
-{{#travis-layout layoutName="layouts/profile" class="owner"}}
+{{#travis-layout layoutName="layouts/simple" class="owner"}}
 <header class="owner-header row">
   <div class="owner-avatar">
     <img src={{avatarURL}} alt="" width="125" height="125">