diff --git a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
index b1afe72ef..d86dc998a 100644
--- a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
+++ b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
@@ -158,7 +158,7 @@
     </app-dialogue-turn>
   </ng-container>
   <app-dialogue-turn
-    actor="self"
+    [actor]="actor.self"
     *ngFor="let area of filteredActiveAreas; first as isFirst"
     [isConnected]="!isFirst"
     [isTriggered]="eventState?.event?.thresholdReached"
@@ -276,7 +276,7 @@
                   changeAction(
                     area.placeCode,
                     action.action,
-                    $event.detail.checked
+                    $event['detail']['checked']
                   )
                 "
               ></ion-checkbox>
diff --git a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
index 9cf5441f9..634b4bddd 100644
--- a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
+++ b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
@@ -26,6 +26,7 @@ import { EventState } from 'src/app/types/event-state';
 import { TimelineState } from 'src/app/types/timeline-state';
 import { AggregatesService } from '../../services/aggregates.service';
 import { TimelineService } from '../../services/timeline.service';
+import { Actor } from '../../types/chat';
 import { Indicator } from '../../types/indicator-group';
 import { LeadTimeTriggerKey, LeadTimeUnit } from '../../types/lead-time';
 import { TriggeredArea } from '../../types/triggered-area';
@@ -78,6 +79,8 @@ export class ChatComponent implements OnInit, OnDestroy {
   private lastModelRunDateFormat = 'cccc, dd LLLL HH:mm';
   public isWarn = false;
 
+  public actor = Actor;
+
   constructor(
     private eapActionsService: EapActionsService,
     public authService: AuthService,
diff --git a/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.ts b/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.ts
index d12a2bb73..963ace3d3 100644
--- a/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.ts
+++ b/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.ts
@@ -1,10 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { DateTime } from 'luxon';
-
-enum Actor {
-  system = 'system',
-  self = 'self',
-}
+import { Actor } from '../../types/chat';
 
 @Component({
   selector: 'app-dialogue-turn',
diff --git a/interfaces/IBF-dashboard/src/app/components/event-speech-bubble/event-speech-bubble.component.html b/interfaces/IBF-dashboard/src/app/components/event-speech-bubble/event-speech-bubble.component.html
index f6dd21d57..639773630 100644
--- a/interfaces/IBF-dashboard/src/app/components/event-speech-bubble/event-speech-bubble.component.html
+++ b/interfaces/IBF-dashboard/src/app/components/event-speech-bubble/event-speech-bubble.component.html
@@ -1,10 +1,10 @@
 <app-dialogue-turn
   *ngIf="type === 'active'"
-  isConnected="true"
+  [isConnected]="true"
   [isTriggered]="event.thresholdReached"
   [isNotTriggered]="!event.thresholdReached"
   [isSelected]="eventBubbleIsSelected(event.eventName)"
-  isConnected="true"
+  [isConnected]="true"
 >
   <ng-container *ngIf="event.activeTrigger && event.thresholdReached">
     <span>
@@ -190,9 +190,9 @@
 
 <app-dialogue-turn
   *ngIf="type === 'stopped' && event.eventName === selectedEvent"
-  isConnected="true"
-  isStopped="true"
-  isConnected="true"
+  [isConnected]="true"
+  [isStopped]="true"
+  [isConnected]="true"
 >
   <ng-container>
     <p
@@ -234,7 +234,7 @@
   </ng-container>
 </app-dialogue-turn>
 
-<app-dialogue-turn *ngIf="type === 'old'" isConnected="true">
+<app-dialogue-turn *ngIf="type === 'old'" [isConnected]="true">
   <p
     [innerHTML]="
       'chat-component.' + disasterTypeName + '.active-event-no-trigger.welcome'
@@ -254,7 +254,7 @@
   ></p>
 </app-dialogue-turn>
 
-<app-dialogue-turn *ngIf="type === 'no-event'" isConnected="true">
+<app-dialogue-turn *ngIf="type === 'no-event'" [isConnected]="true">
   <p
     [innerHTML]="
       'chat-component.' + disasterTypeName + '.no-event-no-trigger.welcome'
diff --git a/interfaces/IBF-dashboard/src/app/components/timestamp/timestamp.component.ts b/interfaces/IBF-dashboard/src/app/components/timestamp/timestamp.component.ts
index 003ea97d3..3f7e822ba 100644
--- a/interfaces/IBF-dashboard/src/app/components/timestamp/timestamp.component.ts
+++ b/interfaces/IBF-dashboard/src/app/components/timestamp/timestamp.component.ts
@@ -8,7 +8,7 @@ import { DateTime } from 'luxon';
 })
 export class TimestampComponent implements OnInit {
   @Input()
-  private timestamp: DateTime = DateTime.now();
+  public timestamp: DateTime = DateTime.now();
 
   private dateFormat = 'cccc, dd LLLL';
   private timeFormat = 'HH:mm';
diff --git a/interfaces/IBF-dashboard/src/app/types/chat.ts b/interfaces/IBF-dashboard/src/app/types/chat.ts
new file mode 100644
index 000000000..91d035c79
--- /dev/null
+++ b/interfaces/IBF-dashboard/src/app/types/chat.ts
@@ -0,0 +1,4 @@
+export enum Actor {
+  system = 'system',
+  self = 'self',
+}
diff --git a/interfaces/IBF-dashboard/src/app/types/eap-action.ts b/interfaces/IBF-dashboard/src/app/types/eap-action.ts
index f84f7933b..78185e85a 100644
--- a/interfaces/IBF-dashboard/src/app/types/eap-action.ts
+++ b/interfaces/IBF-dashboard/src/app/types/eap-action.ts
@@ -6,4 +6,5 @@ export class EapAction {
   placeCode: string;
   month: JSON;
   monthLong: JSON;
+  aofLabel?: string;
 }
diff --git a/interfaces/IBF-dashboard/src/app/types/indicator-group.ts b/interfaces/IBF-dashboard/src/app/types/indicator-group.ts
index 7e3f017e8..1163cd9b5 100644
--- a/interfaces/IBF-dashboard/src/app/types/indicator-group.ts
+++ b/interfaces/IBF-dashboard/src/app/types/indicator-group.ts
@@ -17,6 +17,7 @@ export class Indicator {
   lazyLoad: boolean;
   dynamic?: boolean;
   description: JSON;
+  aggregateUnit: string;
 }
 
 export enum NumberFormat {