diff --git a/demo-shell-ng2/app/app.component.css b/demo-shell-ng2/app/app.component.css
index 5ff84bf111..00e49cd0b7 100644
--- a/demo-shell-ng2/app/app.component.css
+++ b/demo-shell-ng2/app/app.component.css
@@ -1,12 +1,12 @@
 @media screen and (max-width: 1024px) {
     .mdl-layout__header {
-         display: block;
+        display: block;
     }
 }
 
 @media screen and (max-width: 1024px) {
     .mdl-layout__header {
-         display: block;
+        display: block;
     }
 }
 
@@ -25,3 +25,11 @@
 .hide {
     display: none !important;
 }
+
+.mdl-navigation__link {
+    cursor: pointer;
+}
+
+.mdl-navigation__link label {
+    cursor: pointer;
+}
diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html
index 036b9226e6..9fba4758d4 100644
--- a/demo-shell-ng2/app/app.component.html
+++ b/demo-shell-ng2/app/app.component.html
@@ -62,6 +62,7 @@
             <a class="mdl-navigation__link" href="" routerLink="/activiti" (click)="hideDrawer()">Activiti</a>
             <a class="mdl-navigation__link" href="" routerLink="/webscript" (click)="hideDrawer()">Webscript</a>
             <a class="mdl-navigation__link" href="" routerLink="/tag" (click)="hideDrawer()">Tag</a>
+            <a class="mdl-navigation__link" href="" routerLink="/about" (click)="hideDrawer()">About</a>
             <a class="mdl-navigation__link" href="" routerLink="/settings" (click)="hideDrawer()">Settings</a>
         </nav>
     </div>
diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts
index d382b24916..7a07df8dd3 100644
--- a/demo-shell-ng2/app/app.component.ts
+++ b/demo-shell-ng2/app/app.component.ts
@@ -78,20 +78,24 @@ export class AppComponent {
         this.auth.logout()
             .subscribe(
                 () => {
-                    this.router.navigate(['/login']);
-                    this.hideDrawer();
+                    this.navigateToLogin();
                 },
-                ($event: any) => {
-                    if ($event && $event.response && $event.response.status === 401) {
-                        this.router.navigate(['/login']);
-                        this.hideDrawer();
+                (error: any) => {
+                    if (error && error.response && error.response.status === 401) {
+                        this.navigateToLogin();
                     } else {
-                        console.error('An unknown error occurred while logging out', $event);
+                        console.error('An unknown error occurred while logging out', error);
+                        this.navigateToLogin();
                     }
                 }
             );
     }
 
+    navigateToLogin(){
+        this.router.navigate(['/login']);
+        this.hideDrawer();
+    }
+
     onToggleSearch(event) {
         let expandedHeaderClass = 'header-search-expanded',
             header = document.querySelector('header');
diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.css b/demo-shell-ng2/app/components/activiti/activiti-demo.component.css
index a3615db4f2..483a152276 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.css
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.css
@@ -10,7 +10,7 @@
 .task-column {
     background-color: #f5f5f5;
     padding: 10px 10px 10px 10px;
-    border: solid 2px rgb(31, 188, 210);
+    border-right: solid 2px rgb(144, 143, 143);
 }
 
 .list-column {
diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
index 0d08e2376e..32044e462e 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -19,13 +19,15 @@
             <div class="page-content">
                 <div class="mdl-grid">
                     <div class="mdl-cell mdl-cell--2-col task-column mdl-shadow--2dp">
-                        <span>Task Filters</span>
+                        <span><h5>Task Filters</h5></span>
+                        <hr>
                         <activiti-start-task [appId]="appId" (onSuccess)="onStartTaskSuccess($event)"></activiti-start-task>
                         <activiti-filters [appId]="appId" (filterClick)="onTaskFilterClick($event)" (onSuccess)="onSuccessTaskFilterList($event)"
                                           #activitifilter></activiti-filters>
                     </div>
                     <div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp list-column">
-                        <span>Task List</span>
+                        <span><h5>Task List</h5></span>
+                        <hr>
                         <activiti-tasklist *ngIf="taskFilter?.hasFilter()" [appId]="taskFilter.appId"
                                            [processDefinitionKey]="taskFilter.filter.processDefinitionKey"
                                            [name]="taskFilter.filter.name"
@@ -37,7 +39,8 @@
                                            #activititasklist></activiti-tasklist>
                     </div>
                     <div class="mdl-cell mdl-cell--7-col task-column mdl-shadow--2dp">
-                        <span>Task Details</span>
+                        <span><h5>Task Details</h5></span>
+                        <hr>
                         <activiti-task-details [taskId]="currentTaskId" (formCompleted)="onFormCompleted($event)"
                                                #activitidetails></activiti-task-details>
                     </div>
@@ -52,15 +55,17 @@
             <div class="page-content">
                 <div class="page-content">
                     <div class="mdl-grid">
-                        <div class="mdl-cell mdl-cell--2-col task-column">
-                            <span>Process Filters</span>
+                        <div class="mdl-cell mdl-cell--2-col task-column  mdl-shadow--2dp">
+                            <span><h5>Process Filters</h5></span>
+                            <hr>
                             <button type="button" (click)="navigateStartProcess()" class="mdl-button" data-automation-id="btn-start-process">Start Process</button>
                             <activiti-process-instance-filters [appId]="appId"
                                     (filterClick)="onProcessFilterClick($event)"
                                     (onSuccess)="onSuccessProcessFilterList($event)"></activiti-process-instance-filters>
                         </div>
-                        <div class="mdl-cell mdl-cell--3-col task-column list-column">
-                            <span>Process List</span>
+                        <div class="mdl-cell mdl-cell--3-col task-column list-column  mdl-shadow--2dp">
+                            <span><h5>Process List</h5></span>
+                            <hr>
                             <activiti-process-instance-list *ngIf="processFilter?.hasFilter()" [appId]="processFilter.appId"
                                     [processDefinitionKey]="processFilter.filter.processDefinitionKey"
                                     [name]="processFilter.filter.name"
@@ -70,14 +75,16 @@
                                     (rowClick)="onProcessRowClick($event)"
                                     (onSuccess)="onSuccessProcessList($event)"></activiti-process-instance-list>
                         </div>
-                        <div class="mdl-cell mdl-cell--7-col task-column" *ngIf="!isStartProcessMode()">
-                            <span>Process Details</span>
+                        <div class="mdl-cell mdl-cell--7-col task-column mdl-shadow--2dp"  *ngIf="!isStartProcessMode()">
+                            <span><h5>Process Details</h5></span>
+                            <hr>
                             <activiti-process-instance-details [processInstanceId]="currentProcessInstanceId"
                                     (activitiprocesslist)="taskFormCompleted()"
                                     (processCancelled)="processCancelled()"></activiti-process-instance-details>
                         </div>
                         <div class="mdl-cell mdl-cell--7-col task-column" *ngIf="isStartProcessMode()">
                             <span>Start Process</span>
+                            <hr>
                             <activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process>
                         </div>
                     </div>
@@ -92,6 +99,8 @@
             <div class="page-content">
                 <div class="mdl-grid">
                     <div class="mdl-cell mdl-cell--4-col task-column mdl-shadow--2dp">
+                        <span><h5>Report List</h5></span>
+                        <hr>
                         <analytics-report-list
                                 (reportClick)="onReportClick($event)"
                                 #analyticsreportlist >
diff --git a/demo-shell-ng2/app/components/home/home.component.css b/demo-shell-ng2/app/components/home/home.component.css
index 1ed9877dc1..0de97b445c 100644
--- a/demo-shell-ng2/app/components/home/home.component.css
+++ b/demo-shell-ng2/app/components/home/home.component.css
@@ -16,7 +16,7 @@
 
 .demo-card-square > .mdl-card__title {
     color: #fff;
-    background-color: #a1ce6d;
+    background-color: rgb(158, 158, 158);
 }
 
 .mdl-card__title {
diff --git a/demo-shell-ng2/config/webpack.common.js b/demo-shell-ng2/config/webpack.common.js
index a888f3c033..21c6fc688b 100644
--- a/demo-shell-ng2/config/webpack.common.js
+++ b/demo-shell-ng2/config/webpack.common.js
@@ -18,9 +18,6 @@ let options = {
 let alfrescoLibs = glob.sync(pattern, options);
 // console.dir(alfrescoLibs);
 
-let alfrescoLibsModules = alfrescoLibs.map(p => path.join(p, 'node_modules'));
-let alfrescoLibsSources = alfrescoLibs.map(p => path.join(p, 'src'));
-
 module.exports = {
     entry: {
         'polyfills': './app/polyfills.ts',
@@ -106,10 +103,7 @@ module.exports = {
 
     plugins: [
 
-        new webpack.WatchIgnorePlugin([
-            ...alfrescoLibsModules,
-            ...alfrescoLibsSources
-        ]),
+        new webpack.WatchIgnorePlugin([ new RegExp('^((?!(ng2-activiti|ng2-alfresco|demo-shell-ng2)).)((?!(src|app)).)*$')]),
 
         new CopyWebpackPlugin([
             {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css
index 73d681d4fb..344b6e0525 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css
@@ -38,7 +38,6 @@
 .icon-small h4 {
     clear: left;
     margin-left: 26px;
-    padding-top: 12px;
 }
 
 .icon-small:hover {
@@ -48,4 +47,4 @@
 
 .icon-small:hover .material-icons {
     display: block;
-}
\ No newline at end of file
+}
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html
index 2cec687a9a..7c277338bb 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html
@@ -18,7 +18,7 @@
             <i class="material-icons">mode_edit</i>
             <h4 (click)="editEnable()">{{reportParameters.name}}</h4>
             </span>
-        </div>
+        </div><hr>
         <div *ngFor="let field of reportParameters.definition.parameters">
             <div [ngSwitch]="field.type">
                 <div *ngSwitchCase="'integer'">
@@ -72,4 +72,4 @@
         </div>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>