diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.html b/src/app/components/creator/room-creator-page/room-creator-page.component.html
index 39e8bdb490eea5c6a6b3692a46689925421d094c..4c0a2c2043ae4a90d4ec9b1cedac6f2c64105f52 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.html
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.html
@@ -1,6 +1,6 @@
 <div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px" fxFill>
   <div fxLayout="row" fxLayoutAlign="center">
-    <mat-progress-spinner *ngIf="isLoading" mode="indeterminate"></mat-progress-spinner>
+    <mat-progress-spinner *ngIf="isLoading" color="accent" mode="indeterminate"></mat-progress-spinner>
     <mat-card *ngIf="room">
       <mat-card-header fxLayoutAlign="center">
         <mat-card-title fxLayoutAlign="center">
diff --git a/src/app/components/shared/room-list/room-list.component.html b/src/app/components/shared/room-list/room-list.component.html
index b23ba3efe9b824e705e505b48e11bc43c0d4e966..67e04af7a21d246df0daf047ace1d8d9d1e0af11 100644
--- a/src/app/components/shared/room-list/room-list.component.html
+++ b/src/app/components/shared/room-list/room-list.component.html
@@ -1,29 +1,24 @@
-<mat-accordion>
-  <div fxLayout="row" fxLayoutAlign="center">
-    <mat-progress-spinner *ngIf="isLoading" mode="indeterminate"></mat-progress-spinner>
-  </div>
-  <mat-expansion-panel [disabled]="true" class="matPanelHeader">
-    <mat-expansion-panel-header>
-      <mat-panel-title class="headerTitle">Name</mat-panel-title>
-      <mat-panel-description>Session-Id</mat-panel-description>
-    </mat-expansion-panel-header>
-  </mat-expansion-panel>
-  <mat-divider></mat-divider>
-  <mat-divider></mat-divider>
-  <mat-expansion-panel *ngFor="let room of rooms" class="matPanel">
-    <mat-expansion-panel-header>
-      <button mat-button color="primary" routerLink="/{{ baseUrl }}/room/{{ room.shortId }}">
-        <mat-icon>input</mat-icon>
-      </button>
-      <mat-panel-title>
-        {{ room.name }}
-      </mat-panel-title>
-      <mat-panel-description>
-        {{ room.shortId.slice(0,4) }} {{  room.shortId.slice(4,8) }}
-      </mat-panel-description>
-    </mat-expansion-panel-header>
-    <p>
-      {{ room.description }}
-    </p>
-  </mat-expansion-panel>
-</mat-accordion>
+<mat-expansion-panel [disabled]="true" class="matPanelHeader">
+  <mat-expansion-panel-header>
+    <mat-panel-title class="headerTitle">Name</mat-panel-title>
+    <mat-panel-description>Session-Id</mat-panel-description>
+  </mat-expansion-panel-header>
+</mat-expansion-panel>
+<mat-divider></mat-divider>
+<mat-divider></mat-divider>
+<mat-expansion-panel *ngFor="let room of rooms" class="matPanel">
+  <mat-expansion-panel-header>
+    <button mat-button color="primary" routerLink="/{{ baseUrl }}/room/{{ room.shortId }}">
+      <mat-icon>input</mat-icon>
+    </button>
+    <mat-panel-title>
+      {{ room.name }}
+    </mat-panel-title>
+    <mat-panel-description>
+      {{ room.shortId.slice(0,4) }} {{  room.shortId.slice(4,8) }}
+    </mat-panel-description>
+  </mat-expansion-panel-header>
+  <p>
+    {{ room.description }}
+  </p>
+</mat-expansion-panel>