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 92170512ed..ff099b246a 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -1,6 +1,9 @@
 <div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
+
     <header class="mdl-layout__header">
-        <!-- Tabs -->
+
+        <!-- TABS -->
+
         <div class="mdl-layout__tab-bar mdl-js-ripple-effect" #tabheader>
             <a id="apps-header" href="#apps" class="mdl-layout__tab is-active">APPS</a>
             <a id="tasks-header" href="#tasks" class="mdl-layout__tab">TASK LIST</a>
@@ -8,12 +11,20 @@
             <a id="report-header" href="#report" class="mdl-layout__tab">ANALYTICS</a>
         </div>
     </header>
+
     <main class="mdl-layout__content activiti" #tabmain>
+
+        <!--  APPPS COMPONENT -->
+
         <section class="mdl-layout__tab-panel is-active" id="apps">
             <div class="page-content">
                 <activiti-apps [layoutType]="layoutType" (appClick)="onAppClick($event)" #activitiapps></activiti-apps>
             </div>
         </section>
+
+
+        <!--  TASKS COMPONENT -->
+
         <section class="mdl-layout__tab-panel" id="tasks">
             <div class="page-content">
                 <div class="mdl-grid">
@@ -37,6 +48,10 @@
                 </div>
             </div>
         </section>
+
+
+        <!--  PROCESS COMPONENT -->
+
         <section class="mdl-layout__tab-panel" id="processes">
             <div class="page-content">
                 <div class="page-content">
@@ -62,6 +77,10 @@
                 </div>
             </div>
         </section>
+
+
+        <!--  ANALYTICS COMPONENT -->
+
         <section class="mdl-layout__tab-panel" id="report">
             <div class="page-content">
                 <div class="mdl-grid">
@@ -74,5 +93,6 @@
                 </div>
             </div>
         </section>
+
     </main>
 </div>
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.html
index 64e240a8dc..eba3804202 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.html
@@ -18,12 +18,7 @@
             </div>
             <div class="mdl-card__actions mdl-card--border">
                 <i class="material-icons selectedIcon" *ngIf="isSelected(app.id)">done</i>
-                <div class="mdl-layout-spacer"></div>
-                <button class="mdl-button mdl-button--icon mdl-button--colored"><i class="material-icons">delete</i></button>
-                <button class="mdl-button mdl-button--icon mdl-button--colored"><i class="material-icons">favorite</i></button>
-                <button class="mdl-button mdl-button--icon mdl-button--colored"><i class="material-icons">share</i></button>
-                <button class="mdl-button mdl-button--icon mdl-button--colored"><i class="material-icons">file_download</i></button>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts
index d250f453c0..44e44cdf3f 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts
@@ -94,7 +94,6 @@ export class ActivitiApps implements OnInit {
                         app.theme = ActivitiApps.DEFAULT_TASKS_APP_THEME;
                         app.icon = ActivitiApps.DEFAULT_TASKS_APP_ICON;
                         this.appsObserver.next(app);
-                        this.selectApp(app);
                     } else if (app.deploymentId) {
                         this.appsObserver.next(app);
                     }