diff --git a/client/coral-admin/package.json b/client/coral-admin/package.json
index ced6a3512..048359526 100644
--- a/client/coral-admin/package.json
+++ b/client/coral-admin/package.json
@@ -26,8 +26,8 @@
   },
   "devDependencies": {
     "autoprefixer": "6.5.0",
-    "buble": "0.13.0",
-    "buble-loader": "0.3.0",
+    "babel-core": "^6.18.2",
+    "babel-loader": "^6.2.7",
     "copy-webpack-plugin": "3.0.1",
     "css-loader": "0.25.0",
     "json-loader": "0.5.4",
@@ -36,7 +36,7 @@
     "precss": "1.4.0",
     "standard": "8.2.0",
     "style-loader": "0.13.1",
-    "webpack": "2.1.0-beta.25",
+    "webpack": "^1.13.3",
     "webpack-dev-server": "1.16.1"
   }
 }
diff --git a/client/coral-admin/src/components/App.js b/client/coral-admin/src/components/App.js
index 545cd80a4..2c77fe900 100644
--- a/client/coral-admin/src/components/App.js
+++ b/client/coral-admin/src/components/App.js
@@ -20,10 +20,10 @@ export default class App extends React.Component {
           <Header>
             <div>
               <Router history={browserHistory}>
-                <Route path={config.base} component={ModerationQueue} />
-                <Route path={`${config.base}/embed`} component={CommentStream} />
-                <Route path={`${config.base}/embedlink`} component={EmbedLink} />
-                <Route path={`${config.base}/configure`} component={Configure} />
+                <Route path={config.basePath} component={ModerationQueue} />
+                <Route path={`${config.basePath}/embed`} component={CommentStream} />
+                <Route path={`${config.basePath}/embedlink`} component={EmbedLink} />
+                <Route path={`${config.basePath}/configure`} component={Configure} />
               </Router>
             </div>
           </Header>
diff --git a/client/coral-admin/src/components/Header.js b/client/coral-admin/src/components/Header.js
index 8aebe7864..ed8bfc9bd 100644
--- a/client/coral-admin/src/components/Header.js
+++ b/client/coral-admin/src/components/Header.js
@@ -9,14 +9,14 @@ export default (props) => (
   <Layout fixedDrawer>
     <Header title='Talk'>
       <Navigation>
-        <Link className={styles.navLink} href={`/${config.base}/`}>Moderate</Link>
-        <Link className={styles.navLink} href={`/${config.base}/configure`}>Configure</Link>
+        <Link className={styles.navLink} href={`/${config.basePath}/`}>Moderate</Link>
+        <Link className={styles.navLink} href={`/${config.basePath}/configure`}>Configure</Link>
       </Navigation>
     </Header>
     <Drawer>
       <Navigation>
-        <Link className={styles.navLink} href={`/${config.base}/`}>Moderate</Link>
-        <Link className={styles.navLink} href={`/${config.base}/configure`}>Configure</Link>
+        <Link className={styles.navLink} href={`/${config.basePath}/`}>Moderate</Link>
+        <Link className={styles.navLink} href={`/${config.basePath}/configure`}>Configure</Link>
       </Navigation>
     </Drawer>
     {props.children}
diff --git a/client/coral-admin/src/containers/Configure.css b/client/coral-admin/src/containers/Configure.css
index 2f98a8b99..2c65fd5bc 100644
--- a/client/coral-admin/src/containers/Configure.css
+++ b/client/coral-admin/src/containers/Configure.css
@@ -23,7 +23,10 @@
 }
 
 .configSettingEmbed {
-  composes: configSetting;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  height: 90px;
+  margin-bottom: 10px;
   display: block;
   height: 170px;
 }
diff --git a/client/coral-admin/webpack.config.dev.js b/client/coral-admin/webpack.config.dev.js
index 421da4bb7..e8b0c86f0 100644
--- a/client/coral-admin/webpack.config.dev.js
+++ b/client/coral-admin/webpack.config.dev.js
@@ -24,25 +24,17 @@ module.exports = {
     filename: '[name].js'
   },
   module: {
-    loader: [
-      { test: /\.js$/, loaders: 'buble', include: path.join(__dirname, 'src') },
+    loaders: [
+      { test: /.js$/, loader: 'babel', include: path.join(__dirname, 'src'), exclude: /node_modules/ },
       { test: /\.json$/, loaders: 'json', include: __dirname, exclude: /node_modules/ },
-      { test: /\.css$/, loader: 'style-loader!css-loader?modules&importLoaders=1!postcss-loader' }
+      { test: /\.css$/, loaders: ['style-loader', 'css-loader?importLoaders=1', 'postcss-loader'] }
     ]
   },
-  plugins: [
-    new webpack.LoaderOptionsPlugin({
-      options: {
-        context: __dirname,
-        postcss: [autoprefixer, precss]
-      }
-    })
-  ],
+  plugins: [ autoprefixer, precss ],
   resolve: {
-    modules: [
+    root: [
       path.resolve('./src'),
-      path.resolve('../'),
-      'node_modules'
+      path.resolve('../')
     ]
   },
   devServer: {
diff --git a/client/coral-admin/webpack.config.js b/client/coral-admin/webpack.config.js
index 78585038a..1f3d81500 100644
--- a/client/coral-admin/webpack.config.js
+++ b/client/coral-admin/webpack.config.js
@@ -16,10 +16,11 @@ fs.writeFileSync(path.join(__dirname, 'public/index.html'), templateString)
 
 module.exports = Object.assign({}, devConfig, {
   module: {
-    loader: [
-      { test: /\.js$/, loaders: 'buble', include: [path.join(__dirname, 'src'), path.join(__dirname, '../', 'coral-framework')] },
-      { test: /\.json$/, loaders: 'json', include: __dirname, exclude: /node_modules/ },
-      { test: /\.css$/, loader: 'style-loader!css-loader?modules&importLoaders=1!postcss-loader' }
+    context: __dirname,
+    loaders: [
+      { test: /.js$/, loader: 'babel', include: [path.join(__dirname, 'src'), path.join(__dirname, '../', 'coral-framework')], exclude: /node_modules/ },
+      { test: /.json$/, loader: 'json', include: __dirname, exclude: /node_modules/ },
+      { test: /.css$/, loaders: ['style-loader', 'css-loader?importLoaders=1', 'postcss-loader'] }
     ]
   },
   plugins: [
@@ -27,14 +28,6 @@ module.exports = Object.assign({}, devConfig, {
       from: path.join(__dirname, '..', 'coral-embed-stream', 'dist'),
       to: './embed/comment-stream'
     }]),
-    new webpack.LoaderOptionsPlugin({
-      options: {
-        context: __dirname,
-        postcss: [autoprefixer, precss],
-        minimize: true,
-        debug: false
-      }
-    }),
-    new webpack.optimize.UglifyJsPlugin()
+    autoprefixer, precss
   ]
 })