diff --git a/app/router.coffee b/app/router.coffee
index 0d6eb031..7b4d336b 100644
--- a/app/router.coffee
+++ b/app/router.coffee
@@ -75,7 +75,6 @@ Router.map ->
     @route 'repositories', path: '/'
     # @route 'running', path: '/running'
 
-  @route 'error404', path: '/*path'
-  # @route 'error404', path: '/404'
+  @route 'error404', path: '/404'
 
 `export default Router`
diff --git a/app/routes/owner.coffee b/app/routes/owner.coffee
index ea42e4d0..fe78bb4f 100644
--- a/app/routes/owner.coffee
+++ b/app/routes/owner.coffee
@@ -23,8 +23,7 @@ Route = TravisRoute.extend
       login = transition.params.owner.owner
 
       message = if error.status == 404
-        # @transitionTo('/404')
-        "Couldn't find an owner with login \"#{login}\""
+        @transitionTo('error404')
       else
         "There was an error while loading data, please try again."
 
diff --git a/app/styles/app/layouts/error.sass b/app/styles/app/layouts/error.sass
index 5838bdc6..efd2c1d9 100644
--- a/app/styles/app/layouts/error.sass
+++ b/app/styles/app/layouts/error.sass
@@ -112,11 +112,9 @@
       display: block
   .hill-right
     background-image: url(../images/error/404-hills-right.svg)
-    @include error-position-img(auto 20vw, 99% 58%)
+    @include error-position-img(auto 20vw, 99% 60%)
     @media #{$medium-up}
       @include error-position-img(50vw auto, 99% 58%)
-    @media #{$large-up}
-      @include error-position-img(50vw auto, 99% 54%)
   .error-excavator
     background-image: url(../images/error/excavator.svg)
     @include error-position-img(auto 25vh, 71% 83%)
diff --git a/app/templates/layouts/error.hbs b/app/templates/layouts/error.hbs
index 72c226c2..b3add534 100644
--- a/app/templates/layouts/error.hbs
+++ b/app/templates/layouts/error.hbs
@@ -1,6 +1,8 @@
-<div id="top" class="top">
-  {{render 'top'}}
-</div>
+<header id="top" class="top">
+  <div class="centered">
+    {{render "top"}}
+  </div>
+</header>
 
 <main class="main main--error" role="main">
   {{yield}}
diff --git a/app/templates/layouts/simple.hbs b/app/templates/layouts/simple.hbs
index bb8f9cbc..f47a6b5b 100644
--- a/app/templates/layouts/simple.hbs
+++ b/app/templates/layouts/simple.hbs
@@ -1,5 +1,5 @@
 <div class="wrapper">
-  <header id="top" class="topbar">
+  <header id="top" class="top">
     <div class="centered">
       {{render "top"}}
     </div>