diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 9c20951d144350916f3a0be4b6d029ec8432b148..43f6b8ba07102c4c1b788b6c63a11e4f7748c5c2 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
 import { LoginScreenComponent } from './login-screen/login-screen.component';
-import { RoomComponent } from './room/room.component';
 import { CreatorHomeScreenComponent } from './creator-home-screen/creator-home-screen.component';
 import { CreateCommentComponent } from './create-comment/create-comment.component';
 import { ParticipantHomeScreenComponent } from './participant-home-screen/participant-home-screen.component';
@@ -29,7 +28,7 @@ const routes: Routes = [
   },
   {
     path: 'creator/room/:roomId',
-    component: RoomComponent,
+    component: CreatorRoomComponent,
     canActivate: [AuthenticationGuard]
   },
   {
diff --git a/src/app/creator-room/creator-room.component.html b/src/app/creator-room/creator-room.component.html
index e0b263da174e6c2209ba29fd19a50496b7c3ad5b..79ca12101fc5b56db7f08b1334709605825578c8 100644
--- a/src/app/creator-room/creator-room.component.html
+++ b/src/app/creator-room/creator-room.component.html
@@ -19,7 +19,7 @@
         <button mat-button color="primary" matTooltip="See contents">
           Contents
         </button>
-        <button mat-button color="primary" matTooltip="See room comments">
+        <button mat-button color="primary" matTooltip="See room comments" routerLink="/creator/room/{{room.id}}/comments">
           Comments
         </button>
         <button mat-button color="warn" matTooltip="Delete selected room">
diff --git a/src/app/room/room.component.html b/src/app/room/room.component.html
index bd84e9ca24cb6a32d292d1bfdeddc6283e8e905f..e4bc6fc71b268e206ec1c5b1e2810a5eeef31dfa 100644
--- a/src/app/room/room.component.html
+++ b/src/app/room/room.component.html
@@ -1,4 +1,3 @@
-
 <mat-list *ngIf="room">
   <mat-list-item>ID: {{room.id}}</mat-list-item>
   <mat-list-item>Revision: {{room.revision}}</mat-list-item>
@@ -7,10 +6,6 @@
   <mat-list-item>Name: {{room.name}}</mat-list-item>
   <mat-list-item>Description: {{room.description}}</mat-list-item>
   <mat-list-item>Closed: {{room.closed}}</mat-list-item>
-
-  <button mat-button routerLink="/creator/room/{{room.id}}/comments">
-    Visit comments <!-- Only for creator -->
-  </button>
 </mat-list>
 
 <!-- content-type of room-->