More webapp changes+fixes

webapp/src/app/layout/main-layout/main-layout.component.html

@@ -56,7 +56,20 @@
         </span>
       </div>
       <div class="header-right">
-        <span class="user-id mono">{{ userId }}</span>
+        <div class="expert-mode-toggle">
+          <nz-switch
+            [ngModel]="expertMode()"
+            (ngModelChange)="settingsService.setExpertMode($event)"
+            nzSize="small"
+          ></nz-switch>
+          <span class="expert-mode-label">Expert</span>
+        </div>
+        <div class="user-info">
+          <span class="user-id mono">{{ userId }}</span>
+          @if (currentKey()) {
+            <span class="key-id mono">{{ currentKey()!.keytoken_id }}</span>
+          }
+        </div>
         <button nz-button nzType="text" nzDanger (click)="logout()">
           <span nz-icon nzType="logout"></span>
           Logout