diff --git a/client/less/main.less b/client/less/main.less
index 2b2b1151cb..f68d33a66d 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -77,6 +77,16 @@ h1, h2, h3, h4, h5, h6, p, li {
   margin-top: 20px;
 }
 
+.not-found, .not-found .btn-primary {
+  display: grid;
+  margin: auto;
+  a:hover,
+  a:focus,
+  a:active {
+    text-decoration: none;
+  }
+}
+
 // Thumbnails
 // -------------------------
 
diff --git a/common/app/Flash/flash.less b/common/app/Flash/flash.less
index c8d87c1eeb..edf583f1d4 100644
--- a/common/app/Flash/flash.less
+++ b/common/app/Flash/flash.less
@@ -13,3 +13,8 @@
   flex: 1 0 0px;
   color: #37474f;
 }
+
+#@{ns}-board {
+  margin-top: 50px;
+}
+
diff --git a/common/app/NotFound/Not-Found.jsx b/common/app/NotFound/Not-Found.jsx
index 62be6c0f68..a439c75d90 100644
--- a/common/app/NotFound/Not-Found.jsx
+++ b/common/app/NotFound/Not-Found.jsx
@@ -1,21 +1,29 @@
 import React from 'react';
 // import PropTypes from 'prop-types';
-import { Alert } from 'react-bootstrap';
+import {
+  Alert,
+  Button
+} from 'react-bootstrap';
 
 const propTypes = {};
 
 export default function NotFound() {
   return (
-    <Alert bsStyle='danger'>
-      <h4>We couldn't find a page for that address.</h4>
-      <p>
-        Head back to &thinsp;
-        <a href='/challenges/current-challenge'>
-            your current challenge
-        </a>
-        .
-      </p>
-    </Alert>
+    <div className='not-found'>
+      <Alert bsStyle='info'>
+        <p>
+          { 'Sorry, we couldn\'t find a page for that address.' }
+        </p>
+      </Alert>
+      <a href={'/map'}>
+        <Button
+          bsSize='lg'
+          bsStyle='primary'
+          >
+          Take me to the Challenges
+        </Button>
+      </a>
+    </div>
   );
 }