diff --git a/libs/integration-interface/src/index.ts b/libs/integration-interface/src/index.ts
index 2d617036..95be328d 100644
--- a/libs/integration-interface/src/index.ts
+++ b/libs/integration-interface/src/index.ts
@@ -38,4 +38,5 @@ export * from './lib/topics/permissions-rpc/v1/permissions-rpc.model'
 
 export * from './lib/topics/events/v1/events-topic'
 export * from './lib/topics/events/v1/topic-event-type'
+export * from './lib/topics/events/v1/navigated-event-type'
 export * from './lib/topics/events/v1/navigated-event-payload'
diff --git a/libs/integration-interface/src/lib/topics/events/v1/navigated-event-type.ts b/libs/integration-interface/src/lib/topics/events/v1/navigated-event-type.ts
new file mode 100644
index 00000000..2b11cc41
--- /dev/null
+++ b/libs/integration-interface/src/lib/topics/events/v1/navigated-event-type.ts
@@ -0,0 +1,3 @@
+import { NavigatedEventPayload } from './navigated-event-payload'
+
+export type NavigatedEvent = { type: 'navigated'; payload: NavigatedEventPayload }
diff --git a/libs/integration-interface/src/lib/topics/events/v1/topic-event-type.ts b/libs/integration-interface/src/lib/topics/events/v1/topic-event-type.ts
index 47ee692e..640fc0f4 100644
--- a/libs/integration-interface/src/lib/topics/events/v1/topic-event-type.ts
+++ b/libs/integration-interface/src/lib/topics/events/v1/topic-event-type.ts
@@ -1 +1,3 @@
-export type TopicEventType = { type: string; payload?: unknown | undefined }
+import { NavigatedEvent } from './navigated-event-type'
+
+export type TopicEventType = NavigatedEvent | { type: string; payload?: unknown | undefined }
diff --git a/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html b/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html
index 641f66c5..ec990a1b 100644
--- a/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html
+++ b/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html
@@ -3,43 +3,46 @@
     <ng-container #container></ng-container>
     <ng-content></ng-content>
   </div>
-  <div class="w-full flex flex-row-reverse justify-content-between column-gap-2">
-    <div class="flex flex-row-reverse flex-wrap column-gap-2 row-gap-2">
-      <div>
-        <button
-          id="buttonDialogPrimaryButton"
-          pButton
-          [icon]="dialogData.config.primaryButtonDetails!.icon !== undefined ? dialogData.config.primaryButtonDetails!.icon : ''"
-          (click)="primaryButtonAction()"
-          [label]="dialogData.config.primaryButtonDetails!.key | translate:dialogData.config.primaryButtonDetails?.parameters"
-          [disabled]="primaryButtonDisabled$ | async"
-          [pTooltip]="dialogData.config.primaryButtonDetails!.tooltipKey ? (dialogData.config.primaryButtonDetails!.tooltipKey | translate) : null"
-          [tooltipPosition]="dialogData.config.primaryButtonDetails?.tooltipPosition ?? ''"
-          [attr.aria-label]="dialogData.config.primaryButtonDetails!.key | translate:dialogData.config.primaryButtonDetails?.parameters"
-        ></button>
+  <div
+    class="w-full flex-column sm:flex-row align-content-end sm:align-content-start flex flex-wrap row-gap-2 column-gap-2"
+  >
+    <ng-container *ngFor="let button of leftCustomButtons; index as i">
+      <div [ngStyle]="{'margin-right': (i === leftCustomButtons.length - 1) ? 'auto' : 0}">
+        <ng-container *ngTemplateOutlet="customButton; context: {button: button}"> </ng-container>
       </div>
+    </ng-container>
+    <ng-container *ngFor="let button of rightCustomButtons">
       <div>
-        <button
-          id="buttonDialogSecondaryButton"
-          pButton
-          *ngIf="dialogData.config.secondaryButtonIncluded"
-          [icon]="dialogData.config.secondaryButtonDetails!.icon !== undefined ? dialogData.config.secondaryButtonDetails!.icon : ''"
-          (click)="secondaryButtonAction()"
-          [label]="dialogData.config.secondaryButtonDetails!.key | translate:dialogData.config.secondaryButtonDetails?.parameters"
-          [disabled]="secondaryButtonDisabled$ | async"
-          [pTooltip]="dialogData.config.secondaryButtonDetails!.tooltipKey ? (dialogData.config.secondaryButtonDetails!.tooltipKey | translate) : null"
-          [tooltipPosition]="dialogData.config.secondaryButtonDetails?.tooltipPosition ?? ''"
-          [attr.aria-label]="dialogData.config.secondaryButtonDetails!.key | translate:dialogData.config.secondaryButtonDetails?.parameters"
-        ></button>
-      </div>
-      <div *ngFor="let button of rightCustomButtons">
         <ng-container *ngTemplateOutlet="customButton; context: {button: button}"> </ng-container>
       </div>
+    </ng-container>
+    <div>
+      <button
+        id="buttonDialogSecondaryButton"
+        pButton
+        *ngIf="dialogData.config.secondaryButtonIncluded"
+        [icon]="dialogData.config.secondaryButtonDetails!.icon !== undefined ? dialogData.config.secondaryButtonDetails!.icon : ''"
+        (click)="secondaryButtonAction()"
+        [label]="dialogData.config.secondaryButtonDetails!.key | translate:dialogData.config.secondaryButtonDetails?.parameters"
+        [disabled]="secondaryButtonDisabled$ | async"
+        [pTooltip]="dialogData.config.secondaryButtonDetails!.tooltipKey ? (dialogData.config.secondaryButtonDetails!.tooltipKey | translate) : null"
+        [tooltipPosition]="dialogData.config.secondaryButtonDetails?.tooltipPosition ?? ''"
+        [attr.aria-label]="dialogData.config.secondaryButtonDetails!.key | translate:dialogData.config.secondaryButtonDetails?.parameters"
+      ></button>
     </div>
-    <div class="flex flex-wrap column-gap-2 row-gap-2">
-      <div *ngFor="let button of leftCustomButtons">
-        <ng-container *ngTemplateOutlet="customButton; context: {button: button}"> </ng-container>
-      </div>
+    <div>
+      <button
+        id="buttonDialogPrimaryButton"
+        pButton
+        autofocus
+        [icon]="dialogData.config.primaryButtonDetails!.icon !== undefined ? dialogData.config.primaryButtonDetails!.icon : ''"
+        (click)="primaryButtonAction()"
+        [label]="dialogData.config.primaryButtonDetails!.key | translate:dialogData.config.primaryButtonDetails?.parameters"
+        [disabled]="primaryButtonDisabled$ | async"
+        [pTooltip]="dialogData.config.primaryButtonDetails!.tooltipKey ? (dialogData.config.primaryButtonDetails!.tooltipKey | translate) : null"
+        [tooltipPosition]="dialogData.config.primaryButtonDetails?.tooltipPosition ?? ''"
+        [attr.aria-label]="dialogData.config.primaryButtonDetails!.key | translate:dialogData.config.primaryButtonDetails?.parameters"
+      ></button>
     </div>
   </div>
 </div>