diff --git a/src/app/layout/common/user/user.component.html b/src/app/layout/common/user/user.component.html
index 7e35271..1972b42 100644
--- a/src/app/layout/common/user/user.component.html
+++ b/src/app/layout/common/user/user.component.html
@@ -1,16 +1,11 @@
 <button mat-icon-button [matMenuTriggerFor]="userActions">
     <span class="relative">
-        <ng-container *ngIf="user?.picture; else defaultAvatar">
-            <img
-                class="h-7 w-7 rounded-full object-cover"
-                [src]="getSafeUrl(user?.picture)"
-                alt=""
-                onerror="this.onerror=null; this.src='/images/avatars/avatar-placeholder.png';"
-            />
-        </ng-container>
-        <ng-template #defaultAvatar>
-            <mat-icon [svgIcon]="'heroicons_outline:user-circle'"></mat-icon>
-        </ng-template>
+        @if (user()?.picture) {
+        <img class="h-7 w-7 rounded-full object-cover" [src]="getSafeUrl(user()?.picture)" alt=""
+            onerror="this.onerror=null; this.src='/images/avatars/avatar-placeholder.png';" />
+        } @else {
+        <mat-icon [svgIcon]="'heroicons_outline:user-circle'"></mat-icon>
+        }
     </span>
 </button>
 
@@ -19,8 +14,8 @@
         <span class="flex flex-col leading-none">
             <span>Logged in as</span>
             <span class="mt-1.5 text-md font-medium">{{
-                user?.display_name || user?.name || 'Unknown User'
-            }}</span>
+                user()?.display_name || user?.name || 'Unknown User'
+                }}</span>
         </span>
     </button>
     <mat-divider class="my-2"></mat-divider>
@@ -38,9 +33,7 @@
     </button>
     <mat-divider class="my-2"></mat-divider>
     <button mat-menu-item (click)="logout()">
-        <mat-icon
-            [svgIcon]="'heroicons_outline:arrow-right-on-rectangle'"
-        ></mat-icon>
+        <mat-icon [svgIcon]="'heroicons_outline:arrow-right-on-rectangle'"></mat-icon>
         <span>logout</span>
     </button>
 </mat-menu>
diff --git a/src/app/layout/common/user/user.component.ts b/src/app/layout/common/user/user.component.ts
index 5f7042d..6fa04e4 100644
--- a/src/app/layout/common/user/user.component.ts
+++ b/src/app/layout/common/user/user.component.ts
@@ -3,16 +3,15 @@ import {
     AngorConfigService,
     Scheme,
     Theme,
-    Themes,
 } from '@angor/services/config';
-import { CommonModule, NgClass } from '@angular/common';
+import { CommonModule } from '@angular/common';
 import {
     ChangeDetectionStrategy,
-    ChangeDetectorRef,
     Component,
-    OnDestroy,
-    OnInit,
-    ViewEncapsulation,
+    Signal,
+    inject,
+    signal,
+    effect,
 } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDividerModule } from '@angular/material/divider';
@@ -22,13 +21,11 @@ import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
 import { Router, RouterModule } from '@angular/router';
 import { StorageService } from 'app/services/storage.service';
 import { SignerService } from 'app/services/signer.service';
-import { Subject, takeUntil } from 'rxjs';
 import { NostrLoginService } from 'app/services/nostr-login.service';
 
 @Component({
     selector: 'user',
     templateUrl: './user.component.html',
-    encapsulation: ViewEncapsulation.None,
     changeDetection: ChangeDetectionStrategy.OnPush,
     standalone: true,
     imports: [
@@ -37,96 +34,79 @@ import { NostrLoginService } from 'app/services/nostr-login.service';
         MatIconModule,
         MatDividerModule,
         CommonModule,
-        RouterModule
-    ]
+        RouterModule,
+    ],
 })
-export class UserComponent implements OnInit, OnDestroy {
-
-    user: any;
-    isLoading: boolean = true;
-    errorMessage: string | null = null;
-
-    private _unsubscribeAll: Subject<any> = new Subject<any>();
-    config: AngorConfig;
-    layout: string;
-    scheme: 'dark' | 'light';
-    theme: string;
-    themes: Themes;
-    userPubKey: string;
-
-    constructor(
-        private _changeDetectorRef: ChangeDetectorRef,
-        private _router: Router,
-        private _angorConfigService: AngorConfigService,
-        private _signerService: SignerService,
-        private _storageService: StorageService,
-        private sanitizer: DomSanitizer,
-        private _nostrLoginService: NostrLoginService
-    ) { }
-
-
-    ngOnInit(): void {
-        this.userPubKey = this._signerService.getPublicKey()
-
-        this._angorConfigService.config$
-            .pipe(takeUntil(this._unsubscribeAll))
-            .subscribe((config: AngorConfig) => {
-                localStorage.setItem('angorConfig', JSON.stringify(config));
-                this.config = config;
-                this._changeDetectorRef.detectChanges();
-            });
+export class UserComponent {
+    // Signals
+    user = signal<{ picture?: string; display_name?: string; name?: string } | null>(null);
+    config = signal<AngorConfig | null>(null);
+    userPubKey = signal<string>('');
+
+    private signerService = inject(SignerService);
+    private storageService = inject(StorageService);
+    private angorConfigService = inject(AngorConfigService);
+    private router = inject(Router);
+    private sanitizer = inject(DomSanitizer);
+    private nostrLoginService = inject(NostrLoginService);
+
+    constructor() {
+        // Initialize userPubKey signal
+        this.userPubKey.set(this.signerService.getPublicKey());
+
+        // Load user profile
         this.loadUserProfile();
 
-        this._storageService.profile$.subscribe((data) => {
-            if (data && data.pubKey === this.userPubKey) {
-                this.user = data.metadata;
-                this._changeDetectorRef.detectChanges();
+        // Subscribe to configuration changes
+        effect(() => {
+            this.config.set(this.angorConfigService.config);
+            if (this.config()) {
+                localStorage.setItem(
+                    'angorConfig',
+                    JSON.stringify(this.config())
+                );
             }
         });
-    }
 
-    ngOnDestroy(): void {
-        this._unsubscribeAll.next(null);
-        this._unsubscribeAll.complete();
+        // Listen to profile changes from the storage service
+        this.storageService.profile$.subscribe((data) => {
+            if (data && data.pubKey === this.userPubKey()) {
+                this.user.set(data.metadata || {});
+            }
+        });
     }
 
-    private async loadUserProfile(): Promise<void> {
-
-        this._storageService.getProfile(this.userPubKey).then((metadata) => {
-            this.user = metadata;
-            this._changeDetectorRef.detectChanges();
+    private loadUserProfile(): void {
+        this.storageService.getProfile(this.userPubKey()).then((metadata) => {
+            this.user.set(metadata || {});
         });
-
     }
 
     logout(): void {
-        this._router.navigate(['/logout']);
+        this.router.navigate(['/logout']);
     }
 
-    profile(): void {
-        this._router.navigate(['/profile']);
+    Switch(): void {
+        this.nostrLoginService.switchAccount();
     }
-
-    setLayout(layout: string): void {
-        this._angorConfigService.config = { layout };
-        this._changeDetectorRef.detectChanges();
+    
+    profile(): void {
+        this.router.navigate(['/profile']);
     }
 
     setScheme(scheme: Scheme): void {
-        this._angorConfigService.config = { scheme };
-        this._changeDetectorRef.detectChanges();
+        this.angorConfigService.config = { scheme };
     }
 
     setTheme(theme: Theme): void {
-        this._angorConfigService.config = { theme };
-        this._changeDetectorRef.detectChanges();
+        this.angorConfigService.config = { theme };
     }
 
     getSafeUrl(url: string): SafeUrl {
         return this.sanitizer.bypassSecurityTrustUrl(url);
     }
 
-    Switch() {
-        this._nostrLoginService.switchAccount();
+    switchAccount(): void {
+        this.nostrLoginService.switchAccount();
     }
 }