diff --git a/common/app/components/Nav/Nav.jsx b/common/app/components/Nav/Nav.jsx
index b508a16b923..0184e1d67c5 100644
--- a/common/app/components/Nav/Nav.jsx
+++ b/common/app/components/Nav/Nav.jsx
@@ -12,6 +12,7 @@ import {
 import navLinks from './links.json';
 import FCCNavItem from './NavItem.jsx';
 
+const win = typeof window !== 'undefined' ? window : {};
 const fCClogo = 'https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg';
 
 const logoElement = (
@@ -31,6 +32,16 @@ const toggleButton = (
   </button>
 );
 
+function getDashedName() {
+  let challengeDashedName;
+  if (typeof win.localStorage !== 'undefined') {
+    challengeDashedName = win.localStorage.getItem('currentDashedName');
+  }
+  return challengeDashedName && challengeDashedName !== 'undefined' ?
+    challengeDashedName :
+    '';
+}
+
 export default React.createClass({
   displayName: 'Nav',
 
@@ -68,6 +79,22 @@ export default React.createClass({
     });
   },
 
+  renderLearnBtn() {
+    return (
+      <NavItem
+        href='#'
+        onClick={ () => {
+          const challengeDashedName = getDashedName();
+          const goTo = challengeDashedName ?
+          '/challenges/' + challengeDashedName :
+          '/map';
+          win.location = goTo;
+        }}>
+        Learn
+      </NavItem>
+    );
+  },
+
   renderPoints(username, points) {
     if (!username) {
       return null;
@@ -107,6 +134,7 @@ export default React.createClass({
 
   render() {
     const { username, points, picture } = this.props;
+
     return (
       <Navbar
         className='nav-height'
@@ -119,6 +147,7 @@ export default React.createClass({
             className='hamburger-dropdown'
             navbar={ true }
             right={ true }>
+            { this.renderLearnBtn() }
             { this.renderLinks() }
             { this.renderPoints(username, points) }
             { this.renderSignin(username, picture) }
diff --git a/common/app/components/Nav/links.json b/common/app/components/Nav/links.json
index 79cb418e111..9492a69f6bc 100644
--- a/common/app/components/Nav/links.json
+++ b/common/app/components/Nav/links.json
@@ -17,4 +17,8 @@
   "content": "Jobs",
   "link": "/jobs",
   "react": true
+},{
+  "content": "Links",
+  "link": "/links"
+},{
 }]
diff --git a/common/app/components/NotFound/index.js b/common/app/components/NotFound/index.js
deleted file mode 100644
index 8206b461158..00000000000
--- a/common/app/components/NotFound/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-
-export default class extends React.Component {
-  constructor(props) {
-    super(props);
-  }
-  static displayName = 'NotFound'
-  static propTypes = {}
-  componentDidMount() {
-  }
-  render() {
-    return null;
-  }
-}
diff --git a/common/app/components/NotFound/index.jsx b/common/app/components/NotFound/index.jsx
new file mode 100644
index 00000000000..eb634a2f0d5
--- /dev/null
+++ b/common/app/components/NotFound/index.jsx
@@ -0,0 +1,22 @@
+import React, { PropTypes } from 'react';
+
+const win = typeof window !== 'undefined' ? window : {};
+
+function goToServer(path) {
+  win.location = '/' + path;
+}
+
+export default React.createClass({
+  displayName: 'NotFound',
+  propTypes: {
+    params: PropTypes.object
+  },
+  componentWillMount() {
+    goToServer(this.props.params.splat);
+  },
+  componentDidMount() {
+  },
+  render() {
+    return <span></span>;
+  }
+});
diff --git a/common/app/routes/index.js b/common/app/routes/index.js
index 1f14733f822..1dd1b704fda 100644
--- a/common/app/routes/index.js
+++ b/common/app/routes/index.js
@@ -1,10 +1,15 @@
 import Jobs from './Jobs';
 import Hikes from './Hikes';
+import NotFound from '../components/NotFound/index.jsx';
 
 export default {
   path: '/',
   childRoutes: [
     Jobs,
-    Hikes
+    Hikes,
+    {
+      path: '*',
+      component: NotFound
+    }
   ]
 };