diff --git a/src/app/admin/dashboard/dashboard.component.html b/src/app/admin/dashboard/dashboard.component.html
index 90fcc62..8fecb97 100755
--- a/src/app/admin/dashboard/dashboard.component.html
+++ b/src/app/admin/dashboard/dashboard.component.html
@@ -2,7 +2,7 @@
     <h1 class="ui dividing header">Dashboard</h1>
 
     <div class="ui four cards">
-        <a class="ui raised yellow card" [routerLink]="['/kanban']">
+        <a class="ui raised yellow card" [routerLink]="['/kanban']" *ngIf="hasTeamSelected">
             <div class="content">
                 <div class="header">Start slideshow</div>
                 <div class="meta">
diff --git a/src/app/admin/dashboard/dashboard.component.ts b/src/app/admin/dashboard/dashboard.component.ts
old mode 100644
new mode 100755
index c611a7e..e238f0b
--- a/src/app/admin/dashboard/dashboard.component.ts
+++ b/src/app/admin/dashboard/dashboard.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
+import {SettingsService} from '../../shared/service/settings.service';
 
 @Component({
   selector: 'app-dashboard',
@@ -8,10 +9,15 @@ import { Title } from '@angular/platform-browser';
 })
 export class DashboardComponent implements OnInit {
 
-  constructor(private titleService: Title) { }
+  constructor(private titleService: Title,
+              private settingService: SettingsService) { }
 
   ngOnInit() {
     this.titleService.setTitle('Dashboard : MTAStv');
   }
 
+  get hasTeamSelected(): boolean {
+    return this.settingService.team.id !== null;
+  }
+
 }
diff --git a/src/app/display/watchers/watchers.component.html b/src/app/display/watchers/watchers.component.html
index 4027b36..d930a5a 100755
--- a/src/app/display/watchers/watchers.component.html
+++ b/src/app/display/watchers/watchers.component.html
@@ -2,9 +2,9 @@
   <table class="ui large padded inverted celled2 table" *ngIf="watchers.length">
     <thead>
     <tr>
-      <th class="collapsing"><i class="user icon"></i>Assignee</th>
-      <th><i class="clock outline icon"></i>Issue</th>
-      <th><i class="sticky note outline icon"></i>Last comment</th>
+      <th class="collapsing"><i class="user icon"></i></th>
+      <th><i class="tasks icon"></i>JIRA</th>
+      <th><i class="envelope open outline icon"></i>Last comment</th>
     </tr>
     </thead>
     <tbody>