diff --git a/client/package.json b/client/package.json
index f545045c7..a2574eadd 100644
--- a/client/package.json
+++ b/client/package.json
@@ -6,6 +6,8 @@
   "scripts": {
     "dev": "NODE_ENV=development webpack-dev-server --hot --port 3100 --config ./webpack.config.js",
     "build": "cross-env NODE_ENV=production webpack --mode production --config ./webpack.config.js",
+    "dev_win": "webpack-dev-server --hot --port 3100 --config ./webpack.config.js",
+    "build_win": "webpack --mode production --config ./webpack.config.js",
     "lint": "prettier-standard 'src/**/*.js'"
   },
   "repository": {
@@ -69,7 +71,7 @@
     ]
   },
   "dependencies": {
-    "@advancedalgos/key-vault-client": "0.0.5",
+    "@advancedalgos/key-vault-client": "0.0.6",
     "@advancedalgos/teams-client": "0.0.18",
     "@advancedalgos/web-components": "0.0.10",
     "@babel/runtime": "^7.1.2",
diff --git a/client/src/App.js b/client/src/App.js
index 270107cca..76856fc7c 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -14,7 +14,7 @@ import Auth from './auth'
 import { Header, Footer, Home, Callback } from './views'
 
 import Teams from '@advancedalgos/teams-client'
-// import KeyVault from '@advancedalgos/key-vault-client'
+import KeyVault from '@advancedalgos/key-vault-client'
 
 export const auth = new Auth(
   result => console.log('auth result', result),
@@ -42,7 +42,11 @@ export const MasterApp = () => (
               path='/teams'
               render={props => <Teams {...props} auth={auth} />}
             />
-            {/* <Route exact path='/key-vault' component={KeyVault} /> */}
+            <Route
+              exact
+              path='/key-vault'
+              render={props => <KeyVault {...props} auth={auth} />}
+            />
           </Switch>
           <Footer />
         </div>
diff --git a/client/src/index.js b/client/src/index.js
index 5ba21cb3e..20b95ea99 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -1,7 +1,6 @@
 /* eslint-disable no-unused-vars */
 import React from 'react'
 import ReactDOM from 'react-dom'
-
 import MasterApp from './App'
 
 if (process.env.NODE_ENV !== 'production') {
diff --git a/client/tools/webpack/helpers/webpack.common.config.js b/client/tools/webpack/helpers/webpack.common.config.js
index 7de89589d..496866835 100644
--- a/client/tools/webpack/helpers/webpack.common.config.js
+++ b/client/tools/webpack/helpers/webpack.common.config.js
@@ -9,7 +9,7 @@ module.exports = {
     rules: [
       {
         test: /\.js$/,
-        exclude: /node_modules/,
+        include: /node_modules\\@advancedalgos/,
         loader: 'babel-loader'
       },
       {
@@ -17,6 +17,11 @@ module.exports = {
         include: /node_modules\/@advancedalgos/,
         loader: 'babel-loader'
       },
+      {
+        test: /\.js$/,
+        exclude: /node_modules/,
+        loader: 'babel-loader'
+      },
       {
         test: /\.(png|svg|jpg|gif)$/,
         use: [{ loader: 'file-loader' }
diff --git a/client/tools/webpack/webpack.dev.config.js b/client/tools/webpack/webpack.dev.config.js
index 52c7299da..9ec8cb4a0 100644
--- a/client/tools/webpack/webpack.dev.config.js
+++ b/client/tools/webpack/webpack.dev.config.js
@@ -18,6 +18,10 @@ module.exports = merge(commonConfig, {
     filename: 'script.js'
   },
 
+  devServer: {
+      historyApiFallback: true,
+    },
+
   plugins: [
     new Dotenv({
       path: '.env'