diff --git a/src/app/analysis.service.ts b/src/app/analysis.service.ts
index abf134759fb1ad3100438757800e57a37c81ba11..353dffea72e55ecf3e6d309fd153725cdd0b930c 100644
--- a/src/app/analysis.service.ts
+++ b/src/app/analysis.service.ts
@@ -265,6 +265,9 @@ export class AnalysisService {
     const watch = async () => {
       if (this.tokens.length > 0) {
         this.tasks = await this.getTasks();
+        if (!this.tasks) {
+          return;
+        }
         let queuedOrRunningTasks = 0;
         this.tasks.forEach((task) => {
           if (!task.info.done && !task.info.failed) {
diff --git a/src/app/components/task-list/task-list.component.html b/src/app/components/task-list/task-list.component.html
index 7fe72fc248a626c40c6efde0872bf762cc966d45..c5794b9ac6e7ef37db7b1bf2b7ca648cf77796d1 100644
--- a/src/app/components/task-list/task-list.component.html
+++ b/src/app/components/task-list/task-list.component.html
@@ -1,7 +1,7 @@
 <div class="content">
   <div class="list is-hoverable">
     <a *ngFor="let task of analysis.tasks" class="list-item" [class.is-active]="task.token === token">
-      <div *ngIf="!task.info.startedAt" (click)="open(task.token)">
+      <div *ngIf="!task.info.startedAt">
         <p>
           <span class="is-capitalized"><i class="fa" [class.fa-capsules]="task.info.target === 'drug'"
                                           [class.fa-crosshairs]="task.info.target === 'drug-target'"></i> {{algorithmNames[task.info.algorithm]}}</span>
@@ -24,7 +24,7 @@
           </a>
         </p>
       </div>
-      <div *ngIf="!task.info.done && !task.info.failed && task.info.startedAt" (click)="open(task.token)">
+      <div *ngIf="!task.info.done && !task.info.failed && task.info.startedAt">
         <p>
           <span class="is-capitalized"><i class="fa" [class.fa-capsules]="task.info.target === 'drug'"
                                           [class.fa-crosshairs]="task.info.target === 'drug-target'"></i> {{algorithmNames[task.info.algorithm]}}</span>
@@ -38,7 +38,7 @@
             </span>
           </a>
         </p>
-        <progress class="progress is-success" [value]="task.info.progress * 100" max="100">Test</progress>
+        <progress class="progress is-success" [value]="task.info.progress * 100" max="100"></progress>
       </div>
       <div *ngIf="task.info.done" (click)="open(task.token)" data-tooltip="Show analysis results">
         <p>
@@ -55,14 +55,14 @@
           </a>
         </p>
       </div>
-      <div *ngIf="task.info.failed && task.info.finishedAt == null">
+      <div *ngIf="task.info.failed">
         <p>
           <span class="is-capitalized"><i class="fa" [class.fa-capsules]="task.info.target === 'drug'"
                                           [class.fa-crosshairs]="task.info.target === 'drug-target'"></i> {{algorithmNames[task.info.algorithm]}}</span>
           <span class="icon is-pulled-right"><i class="fas fa-exclamation-triangle" aria-hidden="true"></i></span>
         </p>
         <p class="has-text-danger">
-          <small>{{task.info.status}}</small>
+          <small class="status-field">{{task.info.status}}</small>
           <a (click)="analysis.removeTask(task.token)" class="is-pulled-right has-text-danger">
             <span class="icon is-pulled-right">
               <i class="fa fa-trash"></i>
diff --git a/src/app/components/task-list/task-list.component.scss b/src/app/components/task-list/task-list.component.scss
index 77578f190c872199c9f716929eff46e33d49e471..7e41457996e6b55070d5c87b815542438462601f 100644
--- a/src/app/components/task-list/task-list.component.scss
+++ b/src/app/components/task-list/task-list.component.scss
@@ -8,3 +8,14 @@
     margin-bottom: 5px;
   }
 }
+
+.status-field {
+  background-color: white;
+  padding: 2px;
+  font-size: 10px;
+  max-width: 215px;
+  height: 20px;
+  overflow: hidden;
+  border: 1px solid #e4e4e4;
+  display: inline-block;
+}
diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html
index 6d693342633ca0a6edf9ece1ba3eded7e2a72eda..9b5bd24c0d00d3e929c06a72373a8cbf762f852d 100644
--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
@@ -342,7 +342,7 @@
         <p class="card-header-title">
           <span class="icon">
             <i class="fas fa-filter" aria-hidden="true"></i>
-          </span> Tasks ({{analysis.tokens.length}})
+          </span> Tasks ({{analysis.tasks.length}})
         </p>
         <a (click)="collapseTask = !collapseTask" data-action="collapse" class="card-header-icon is-hidden-fullscreen"
            aria-label="more options">
diff --git a/src/styles.scss b/src/styles.scss
index e539e5fccb84f12bd7bd4301fbff44c981e3c901..eee57a671cd6e3b75d369f0efef1495729f084e1 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -166,7 +166,7 @@ div.field.has-addons.add-remove-toggle {
 }
 
 .fa-spinner {
-  color: $warning;
+  color: $light-invert;
 }
 
 .fa-pause {