diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts
index 3e9bec58b..b70850016 100644
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@@ -42,13 +42,13 @@ import { TokenStorageService } from './services/token-storage.service';
 import { UserService } from './services/user/user.service';
 
 @Component({
-  selector: 'gf-root',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  templateUrl: './app.component.html',
+  imports: [GfFooterComponent, GfHeaderComponent, RouterLink, RouterOutlet],
+  selector: 'gf-root',
   styleUrls: ['./app.component.scss'],
-  imports: [RouterOutlet, RouterLink, GfHeaderComponent, GfFooterComponent]
+  templateUrl: './app.component.html'
 })
-export class AppComponent implements OnDestroy, OnInit {
+export class GfAppComponent implements OnDestroy, OnInit {
   @HostBinding('class.has-info-message') get getHasMessage() {
     return this.hasInfoMessage;
   }
diff --git a/apps/client/src/main.ts b/apps/client/src/main.ts
index 0e2104c76..f1d2e43c1 100644
--- a/apps/client/src/main.ts
+++ b/apps/client/src/main.ts
@@ -29,7 +29,7 @@ import { NgxStripeModule, STRIPE_PUBLISHABLE_KEY } from 'ngx-stripe';
 import { CustomDateAdapter } from './app/adapter/custom-date-adapter';
 import { DateFormats } from './app/adapter/date-formats';
 import { AppRoutingModule } from './app/app-routing.module';
-import { AppComponent } from './app/app.component';
+import { GfAppComponent } from './app/app.component';
 import { authInterceptorProviders } from './app/core/auth.interceptor';
 import { httpResponseInterceptorProviders } from './app/core/http-response.interceptor';
 import { LanguageService } from './app/core/language.service';
@@ -56,7 +56,7 @@ import { environment } from './environments/environment';
     enableProdMode();
   }
 
-  await bootstrapApplication(AppComponent, {
+  await bootstrapApplication(GfAppComponent, {
     providers: [
       { provide: LOCALE_ID, useValue: locale },
       authInterceptorProviders,
@@ -79,6 +79,7 @@ import { environment } from './environments/environment';
       importProvidersFrom(
         AppRoutingModule,
         BrowserAnimationsModule,
+        GfNotificationModule,
         MatAutocompleteModule,
         MatChipsModule,
         MatNativeDateModule,
@@ -88,8 +89,7 @@ import { environment } from './environments/environment';
         ServiceWorkerModule.register('ngsw-worker.js', {
           enabled: environment.production,
           registrationStrategy: 'registerImmediately'
-        }),
-        GfNotificationModule
+        })
       )
     ]
   });