diff --git a/client/coral-admin/package.json b/client/coral-admin/package.json
index 190e6830b..c04809b0f 100644
--- a/client/coral-admin/package.json
+++ b/client/coral-admin/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "build": "./node_modules/.bin/webpack --config webpack.config.js",
+    "build": "./node_modules/.bin/webpack --config webpack.config.js --watch",
     "start": "./node_modules/.bin/webpack-dev-server --config webpack.config.dev.js --inline --hot --content-base public --port 3142"
   },
   "keywords": [],
diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index 55ff1a90f..673a368f8 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -11,12 +11,11 @@ import CommunityContainer from 'containers/CommunityContainer'
 import LayoutContainer from 'containers/LayoutContainer'
 
 const routes = (
-  <Route path={config.base} component={LayoutContainer}>
-    <IndexRoute component={ModerationQueue} />
-    <Route path="embed" component={CommentStream} />
-    <Route path="embedlink" component={EmbedLink} />
-    <Route path="configure" component={Configure} />
-    <Route path="community" component={CommunityContainer} />
+  <Route component={LayoutContainer}>
+    <Route path='admin' component={ModerationQueue} />
+    <Route path='admin/embed' component={CommentStream} />
+    <Route path='admin/embedlink' component={EmbedLink} />
+    <Route path='admin/configure' component={Configure} />
   </Route>
 );
 
diff --git a/client/coral-admin/src/components/ui/Drawer.js b/client/coral-admin/src/components/ui/Drawer.js
index ffb77fbfe..b1c87baaf 100644
--- a/client/coral-admin/src/components/ui/Drawer.js
+++ b/client/coral-admin/src/components/ui/Drawer.js
@@ -2,13 +2,13 @@ import React from 'react'
 import { Navigation, Drawer } from 'react-mdl'
 import { Link } from 'react-router'
 import styles from './Header.css'
-import config from 'services/config'
 
 export default () => (
   <Drawer>
     <Navigation>
-      <Link className={styles.navLink} to={`/${config.basePath}/`}>Moderate</Link>
-      <Link className={styles.navLink} to={`/${config.basePath}/configure`}>Configure</Link>
+      <Link className={styles.navLink} to="/admin">Moderate</Link>
+      <Link className={styles.navLink} to="/admin/community">Community</Link>
+      <Link className={styles.navLink} to="/admin/configure">Configure</Link>
     </Navigation>
   </Drawer>
 )
diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js
index 0c2d8753f..1455721d8 100644
--- a/client/coral-admin/src/components/ui/Header.js
+++ b/client/coral-admin/src/components/ui/Header.js
@@ -6,9 +6,9 @@ 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>
+      <Link className={styles.navLink} to="/admin">Moderate</Link>
+      <Link className={styles.navLink} to="/admin/community">Community</Link>
+      <Link className={styles.navLink} to="/admin/configure">Configure</Link>
     </Navigation>
   </Header>
 )