diff --git a/projects/eav-ui/src/app/edit/dialog/main/edit-dialog-main.component.ts b/projects/eav-ui/src/app/edit/dialog/main/edit-dialog-main.component.ts
index 915823991..1e865c77d 100644
--- a/projects/eav-ui/src/app/edit/dialog/main/edit-dialog-main.component.ts
+++ b/projects/eav-ui/src/app/edit/dialog/main/edit-dialog-main.component.ts
@@ -320,20 +320,18 @@ export class EditDialogMainComponent extends BaseComponent implements OnInit, Af
   }
 
   #snackBarYouHaveUnsavedChanges() {
-    const snackBarData: UnsavedChangesSnackBarData = {
-      save: false,
-    };
     const snackBarRef = this.snackBar.openFromComponent(SnackBarUnsavedChangesComponent, {
-      data: snackBarData,
+      data: {
+        save: false,
+      } satisfies UnsavedChangesSnackBarData,
       duration: 5000,
     });
 
     snackBarRef.onAction().subscribe(() => {
-      if ((snackBarRef.containerInstance.snackBarConfig.data as UnsavedChangesSnackBarData).save) {
+      if ((snackBarRef.containerInstance.snackBarConfig.data as UnsavedChangesSnackBarData).save)
         this.saveAll(true);
-      } else {
+      else
         this.closeDialog(true);
-      }
     });
   }
 }
diff --git a/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.html b/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.html
index 2903e7823..dbf9ad215 100644
--- a/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.html
+++ b/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.html
@@ -1,6 +1,10 @@
-<span class="error-message">{{ 'Errors.UnsavedChanges' | translate }}</span>
+<!-- The message -->
+<span class="error-message">
+  {{ 'Errors.UnsavedChanges' | translate }}
+</span>
 
-<div fxLayoutAlign="end end">
+<!-- The save / exit buttons -->
+<div class="my-flex-right">
   <button mat-button color="primary" (click)="saveChanges(false)">
     {{ 'General.Buttons.NotSave' | translate | uppercase }}
   </button>
diff --git a/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.scss b/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.scss
index 028afb8da..27746db70 100644
--- a/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.scss
+++ b/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.scss
@@ -1,3 +1,8 @@
 .error-message {
   font-size: 14px;
 }
+
+.my-flex-right {
+  display: flex;
+  justify-content: end;
+}
\ No newline at end of file
diff --git a/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.ts b/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.ts
index 916eb0fb2..3d0e651c4 100644
--- a/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.ts
+++ b/projects/eav-ui/src/app/edit/dialog/main/snack-bar-unsaved-changes/snack-bar-unsaved-changes.component.ts
@@ -1,22 +1,21 @@
-import { Component, Inject } from '@angular/core';
-import { MatSnackBarRef, MAT_SNACK_BAR_DATA } from '@angular/material/snack-bar';
-import { UnsavedChangesSnackBarData } from './snack-bar-unsaved-changes.models';
-import { TranslateModule } from '@ngx-translate/core';
 import { UpperCasePipe } from '@angular/common';
+import { Component, Inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
-import { FlexModule } from '@angular/flex-layout/flex';
+import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from '@angular/material/snack-bar';
+import { TranslateModule } from '@ngx-translate/core';
+import { UnsavedChangesSnackBarData } from './snack-bar-unsaved-changes.models';
+
 @Component({
-    selector: 'app-snack-bar-unsaved-changes',
-    templateUrl: './snack-bar-unsaved-changes.component.html',
-    styleUrls: ['./snack-bar-unsaved-changes.component.scss'],
-    standalone: true,
-    imports: [
-        FlexModule,
-        MatButtonModule,
-        UpperCasePipe,
-        TranslateModule,
-        UpperCasePipe
-    ],
+  selector: 'app-snack-bar-unsaved-changes',
+  templateUrl: './snack-bar-unsaved-changes.component.html',
+  styleUrls: ['./snack-bar-unsaved-changes.component.scss'],
+  standalone: true,
+  imports: [
+    MatButtonModule,
+    UpperCasePipe,
+    TranslateModule,
+    UpperCasePipe
+  ],
 })
 export class SnackBarUnsavedChangesComponent {
   constructor(
diff --git a/projects/eav-ui/src/app/edit/fields/picker/adapters/state-adapter-entity.ts b/projects/eav-ui/src/app/edit/fields/picker/adapters/state-adapter-entity.ts
index 6919cd742..3895a2856 100644
--- a/projects/eav-ui/src/app/edit/fields/picker/adapters/state-adapter-entity.ts
+++ b/projects/eav-ui/src/app/edit/fields/picker/adapters/state-adapter-entity.ts
@@ -1,12 +1,12 @@
-import { logSpecsStateAdapter, StateAdapter } from "./state-adapter";
 import { Injectable } from '@angular/core';
 import { classLog } from "../../../../shared/logging";
+import { logSpecsStateAdapter, StateAdapter } from "./state-adapter";
 import { StateUiMapperNoop } from './state-ui-mapper-noop';
 
 @Injectable()
 export class StateAdapterEntity extends StateAdapter {
   
-  log = classLog({StateAdapterEntity}, logSpecsStateAdapter, true);
+  log = classLog({StateAdapterEntity}, logSpecsStateAdapter);
 
   constructor() { super(); }