diff --git a/projects/gameboard-ui/src/app/admin/components/admin-overview/admin-overview.component.html b/projects/gameboard-ui/src/app/admin/components/admin-overview/admin-overview.component.html
index eca27318..9ca35efc 100644
--- a/projects/gameboard-ui/src/app/admin/components/admin-overview/admin-overview.component.html
+++ b/projects/gameboard-ui/src/app/admin/components/admin-overview/admin-overview.component.html
@@ -4,4 +4,10 @@ <h4>Live Stats</h4>
 
     <h4>Send Announcement to All Players</h4>
     <app-announce></app-announce>
+
+    <h4 class="mt-4">Your connections</h4>
+    <ul>
+        <li>Game Hub: {{ gameHubState$ | async }}</li>
+        <li>Support Hub: {{ supportHubState$ | async }} </li>
+    </ul>
 </div>
diff --git a/projects/gameboard-ui/src/app/admin/components/admin-overview/admin-overview.component.ts b/projects/gameboard-ui/src/app/admin/components/admin-overview/admin-overview.component.ts
index ce3526ef..c060e94f 100644
--- a/projects/gameboard-ui/src/app/admin/components/admin-overview/admin-overview.component.ts
+++ b/projects/gameboard-ui/src/app/admin/components/admin-overview/admin-overview.component.ts
@@ -1,4 +1,8 @@
+import { GameHubService } from '@/services/signalR/game-hub.service';
+import { SupportHubService } from '@/services/signalR/support-hub.service';
 import { Component } from '@angular/core';
+import { HubConnectionState } from '@microsoft/signalr';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'app-admin-overview',
@@ -6,5 +10,13 @@ import { Component } from '@angular/core';
   styleUrls: ['./admin-overview.component.scss']
 })
 export class AdminOverviewComponent {
+  protected gameHubState$: Observable<HubConnectionState>;
+  protected supportHubState$: Observable<HubConnectionState>;
 
+  constructor(
+    private gameHubService: GameHubService,
+    supportHub: SupportHubService) {
+    this.gameHubState$ = gameHubService.hubState$;
+    this.supportHubState$ = supportHub.hubState$;
+  }
 }
diff --git a/projects/gameboard-ui/src/app/game/pipes/score-to-tooltip.pipe.ts b/projects/gameboard-ui/src/app/game/pipes/score-to-tooltip.pipe.ts
index b63d95b5..33258423 100644
--- a/projects/gameboard-ui/src/app/game/pipes/score-to-tooltip.pipe.ts
+++ b/projects/gameboard-ui/src/app/game/pipes/score-to-tooltip.pipe.ts
@@ -7,6 +7,16 @@ export class ScoreToTooltipPipe implements PipeTransform {
     if (!value || value.scoreOverall === 0 || value.scoreOverall === value.scoreChallenge)
       return "";
 
-    return `${value.scoreChallenge} + ${(value.scoreAdvanced || 0) + value.scoreAutoBonus + value.scoreManualBonus} bonus (click for details)`;
+    let previousGameClause = "";
+    if (value.scoreAdvanced || 0) {
+      previousGameClause = ` + ${value.scoreAdvanced || 0} previous`;
+    }
+
+    let bonusClause = "";
+    const bonusPoints = (value.scoreAutoBonus || 0) || (value.scoreManualBonus || 0);
+    if (bonusPoints)
+      bonusClause = ` + ${bonusPoints} bonus `;
+
+    return `${value.scoreChallenge}${previousGameClause}${bonusClause} (click for details)`;
   }
 }