diff --git a/src/common/layouts/App/App.jsx b/src/common/layouts/App/App.jsx
deleted file mode 100644
index a5b82af..0000000
--- a/src/common/layouts/App/App.jsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React, { PropTypes } from 'react'
-import Helmet from 'react-helmet'
-import config from '../../config'
-
-import '../../styles/normalize.css'
-import styles from './App.scss'
-
-const propTypes = {
-  children: PropTypes.object,
-}
-
-function App(props) {
-  return (
-    <div className={styles.App}>
-      <Helmet {...config.app} />
-      <div className={styles.header}>
-        <img src={require('./assets/logo.svg')} alt="Logo" role="presentation" />
-        <h1>{config.app.title}</h1>
-      </div>
-      <hr />
-      {props.children}
-    </div>
-  )
-}
-
-App.propTypes = propTypes
-
-export default App
diff --git a/src/common/layouts/App/App.scss b/src/common/layouts/App/App.scss
deleted file mode 100644
index ddfd656..0000000
--- a/src/common/layouts/App/App.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@import '../../styles/variables';
-
-body {
-  background-color: $color-dark-gray;
-  font-family: 'Helvetica-Light', Helvetica, Arial, sans-serif;
-}
-
-.App {
-  color: $color-white;
-
-  .header {
-    overflow: auto;
-    padding: 15px;
-
-    img {
-      float: left;
-      height: 70px;
-      margin-right: 1em;
-    }
-  }
-
-  hr {
-    margin-bottom: 0;
-    margin-top: 0;
-    opacity: 0.15;
-  }
-}
diff --git a/src/common/layouts/App/assets/logo.svg b/src/common/layouts/App/assets/logo.svg
deleted file mode 100644
index b2204ca..0000000
--- a/src/common/layouts/App/assets/logo.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="570" height="510" viewBox="0, 0, 570, 510">
-  <g id="Background">
-    <rect x="0" y="0" width="570" height="510" fill="#000000" fill-opacity="0"/>
-  </g>
-  <g id="Layer_1">
-    <path d="M334.696,254.628 C334.696,282.334 312.235,304.795 284.529,304.795 C256.823,304.795 234.362,282.334 234.362,254.628 C234.362,226.922 256.823,204.461 284.529,204.461 C312.235,204.461 334.696,226.922 334.696,254.628 z" fill="#00D8FF"/>
-    <path d="M284.529,152.628 C351.885,152.628 414.457,162.293 461.636,178.535 C518.48,198.104 553.43,227.768 553.43,254.628 C553.43,282.619 516.389,314.131 455.347,334.356 C409.196,349.647 348.468,357.628 284.529,357.628 C218.975,357.628 156.899,350.136 110.239,334.187 C51.193,314.005 15.628,282.084 15.628,254.628 C15.628,227.986 48.998,198.552 105.043,179.012 C152.398,162.503 216.515,152.628 284.529,152.628 z" fill-opacity="0" stroke="#00D8FF" stroke-width="24" stroke-miterlimit="10"/>
-    <path d="M195.736,203.922 C229.385,145.574 269.017,96.198 306.656,63.442 C352.006,23.976 395.163,8.519 418.431,21.937 C442.679,35.92 451.473,83.751 438.498,146.733 C428.688,194.351 405.264,250.945 373.322,306.334 C340.573,363.122 303.072,413.153 265.945,445.606 C218.964,486.674 173.545,501.535 149.76,487.819 C126.681,474.509 117.854,430.898 128.926,372.586 C138.281,323.316 161.758,262.841 195.736,203.922 z" fill-opacity="0" stroke="#00D8FF" stroke-width="24" stroke-miterlimit="10"/>
-    <path d="M195.821,306.482 C162.075,248.19 139.09,189.195 129.509,140.227 C117.965,81.228 126.127,36.118 149.373,22.661 C173.597,8.637 219.428,24.905 267.513,67.601 C303.869,99.881 341.201,148.438 373.236,203.774 C406.08,260.507 430.697,317.983 440.272,366.356 C452.389,427.569 442.581,474.34 418.819,488.096 C395.762,501.444 353.57,487.312 308.58,448.597 C270.567,415.886 229.898,365.344 195.821,306.482 z" fill-opacity="0" stroke="#00D8FF" stroke-width="24" stroke-miterlimit="10"/>
-  </g>
-</svg>
diff --git a/src/common/layouts/App/index.js b/src/common/layouts/App/index.js
deleted file mode 100644
index f22feb8..0000000
--- a/src/common/layouts/App/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import App from './App'
-
-export default App
diff --git a/src/common/layouts/AppLayout/AppLayout.jsx b/src/common/layouts/AppLayout/AppLayout.jsx
new file mode 100644
index 0000000..820e55b
--- /dev/null
+++ b/src/common/layouts/AppLayout/AppLayout.jsx
@@ -0,0 +1,31 @@
+import React, { PropTypes } from 'react'
+import { Link } from 'react-router'
+import Helmet from 'react-helmet'
+
+import config from '../../config'
+
+const propTypes = {
+  children: PropTypes.object
+}
+
+function AppLayout(props) {
+  return (
+    <div className="views">
+      <Helmet {...config.app} />
+
+      <h1>{config.app.title}</h1>
+
+      <ul>
+        <li><Link to="/">Home</Link></li>
+        <li><Link to="/hello">Hello</Link></li>
+        <li><Link to="/about">About</Link></li>
+      </ul>
+
+      {props.children}
+    </div>
+  )
+}
+
+AppLayout.propTypes = propTypes
+
+export default AppLayout
diff --git a/src/common/layouts/AppLayout/index.js b/src/common/layouts/AppLayout/index.js
new file mode 100644
index 0000000..886421d
--- /dev/null
+++ b/src/common/layouts/AppLayout/index.js
@@ -0,0 +1,6 @@
+// *** GLOBAL STYLES *** //
+import 'common/styles/global/app.scss'
+
+import AppLayout from './AppLayout'
+
+export default AppLayout