diff --git a/client/coral-admin/src/components/App.js b/client/coral-admin/src/components/App.js
index 4e904257e..1fbbe1448 100644
--- a/client/coral-admin/src/components/App.js
+++ b/client/coral-admin/src/components/App.js
@@ -2,7 +2,6 @@ import React from 'react'
 import { Provider } from 'react-redux'
 import 'material-design-lite'
 import { Layout } from 'react-mdl'
-import Header from 'components/Header'
 import store from 'services/store'
 
 import AppRouter from '../AppRouter'
diff --git a/client/coral-admin/src/components/Header.js b/client/coral-admin/src/components/Header.js
deleted file mode 100644
index ed60f497b..000000000
--- a/client/coral-admin/src/components/Header.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react'
-import { Navigation, Header } from 'react-mdl'
-import { Link } from 'react-router'
-import styles from './Header.css'
-
-export default () => (
-    <Header title='Talk'>
-      <Navigation>
-        <Link className={styles.navLink} to="/">Moderate</Link>
-        <Link className={styles.navLink} to="community">Community</Link>
-        <Link className={styles.navLink} to="configure">Configure</Link>
-      </Navigation>
-    </Header>
-)
diff --git a/client/coral-admin/src/components/Header.css b/client/coral-admin/src/components/ui/Header.css
similarity index 100%
rename from client/coral-admin/src/components/Header.css
rename to client/coral-admin/src/components/ui/Header.css
diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js
new file mode 100644
index 000000000..0c2d8753f
--- /dev/null
+++ b/client/coral-admin/src/components/ui/Header.js
@@ -0,0 +1,14 @@
+import React from 'react'
+import { Navigation, Header } from 'react-mdl'
+import { Link } from 'react-router'
+import styles from './Header.css'
+
+export default () => (
+  <Header title='Talk'>
+    <Navigation>
+      <Link className={styles.navLink} to="/">Moderate</Link>
+      <Link className={styles.navLink} to="community">Community</Link>
+      <Link className={styles.navLink} to="configure">Configure</Link>
+    </Navigation>
+  </Header>
+)
diff --git a/client/coral-admin/src/components/ui/Layout.js b/client/coral-admin/src/components/ui/Layout.js
index cdc2f5b41..fd963b667 100644
--- a/client/coral-admin/src/components/ui/Layout.js
+++ b/client/coral-admin/src/components/ui/Layout.js
@@ -1,9 +1,10 @@
 import React from 'react'
 import { Layout as LayoutMDL} from 'react-mdl'
-import Header from '../Header'
+import Header from './Header'
+import Drawer from './Drawer'
 
 export const Layout = ({ children }) => (
-  <LayoutMDL fixedDrawer>>
+  <LayoutMDL fixedDrawer>
     <Header />
     <Drawer />
     {children}