diff --git a/.vscode/settings.json b/.vscode/settings.json
index 995f793cb7..30d10b67e5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,5 +8,6 @@
         "**/*.js": { "when": "$(basename).ts"},
         "**/*.js.map": { "when": "$(basename)"},
         "**/*.d.ts": { "when": "$(basename).ts"}
-    }
+    },
+    "editor.renderIndentGuides": true
 }
diff --git a/demo-shell-ng2/config/webpack.dev.js b/demo-shell-ng2/config/webpack.dev.js
index 40a565e070..c1684029e5 100644
--- a/demo-shell-ng2/config/webpack.dev.js
+++ b/demo-shell-ng2/config/webpack.dev.js
@@ -10,7 +10,6 @@ module.exports = webpackMerge(commonConfig, {
 
     output: {
         path: helpers.root('dist'),
-        publicPath: 'http://localhost:3000/',
         filename: '[name].js',
         chunkFilename: '[id].chunk.js'
     },
@@ -60,6 +59,9 @@ module.exports = webpackMerge(commonConfig, {
     ],
 
     devServer: {
+        host: '0.0.0.0',
+        port: 3000,
+        inline: true,
         historyApiFallback: true,
         stats: 'minimal'
     }
diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json
index 8e35ae6db4..fae7633dcb 100644
--- a/demo-shell-ng2/package.json
+++ b/demo-shell-ng2/package.json
@@ -5,7 +5,7 @@
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "clean": "npm install rimraf && npm run clean-build  && rimraf dist node_modules typings dist",
-    "start": "npm run server-versions && webpack-dev-server --inline --progress --port 3000 --max_old_space_size=4096 --max_new_space_size=4096",
+    "start": "npm run server-versions && webpack-dev-server --progress --max_old_space_size=4096 --max_new_space_size=4096",
     "start:dist": "wsrv -s dist/ -p 3000 -a 0.0.0.0",
     "clean-build": "rimraf 'app/{,**/}**.js' 'app/{,**/}**.js.map' 'app/{,**/}**.d.ts'",
     "test": "karma start",