diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
index e4f337a0341eddf7dd431977a8601806250f17d2..e1a33d33e1af8e90dab05d62d323b23b1d8874f3 100644
--- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
+++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
@@ -1,12 +1,12 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { Room } from '../../../../models/room';
-import { RoomCreateComponent } from '../../../shared/_dialogs/room-create/room-create.component';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
 import { RoomDeleteComponent } from '../room-delete/room-delete.component';
 import { NotificationService } from '../../../../services/util/notification.service';
 import { TranslateService } from '@ngx-translate/core';
 import { RoomService } from '../../../../services/http/room.service';
 import { Router } from '@angular/router';
+import { RoomCreatorPageComponent } from '../../room-creator-page/room-creator-page.component';
 
 @Component({
   selector: 'app-room-edit',
@@ -17,7 +17,7 @@ export class RoomEditComponent implements OnInit {
   editRoom: Room;
   commentThreshold: number;
 
-  constructor(public dialogRef: MatDialogRef<RoomCreateComponent>,
+  constructor(public dialogRef: MatDialogRef<RoomCreatorPageComponent>,
               public dialog: MatDialog,
               public notificationService: NotificationService,
               public translationService: TranslateService,
@@ -49,7 +49,9 @@ export class RoomEditComponent implements OnInit {
     dialogRef.componentInstance.room = this.editRoom;
     dialogRef.afterClosed()
       .subscribe(result => {
-        this.confirmDeletion(result);
+        if (result === 'delete') {
+          this.deleteRoom(this.editRoom);
+        }
       });
   }
 
@@ -61,10 +63,4 @@ export class RoomEditComponent implements OnInit {
     this.dialogRef.close();
     this.router.navigate([`/creator`]);
   }
-
-  confirmDeletion(dialogAnswer: string): void {
-    if (dialogAnswer === 'delete') {
-      this.deleteRoom(this.editRoom);
-    }
-  }
 }
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 142c359d1bc993373332181165ebcbba46631165..e7bc4b5095040b4609ce613a9802218a565d5494 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
@@ -15,7 +15,7 @@
           </mat-card-subtitle>
         </mat-card-header>
         <span class="fill-remaining-space"></span>
-        <button mat-icon-button id="settings" (click)="showEditDialog()">
+        <button mat-icon-button id="settings" (click)="showSettingsDialog()">
           <mat-icon id="settings-icon" matTooltip="{{ 'room-page.session-settings' | translate}}">settings</mat-icon>
         </button>
       </div>
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
index 8f85d6e2819bd1e0c2de5eacfc0c5bc323652d3d..9437f1d71c9a70674ebd301340f7ced77c806d8f 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.ts
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
@@ -59,8 +59,8 @@ export class RoomCreatorPageComponent extends RoomPageComponent implements OnIni
       });
   }
 
-  showEditDialog(): void {
-    this.updRoom = this.room;
+  showSettingsDialog(): void {
+    this.updRoom = JSON.parse(JSON.stringify(this.room));
     const dialogRef = this.dialog.open(RoomEditComponent, {
       width: '400px'
     });
diff --git a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.html b/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
similarity index 100%
rename from src/app/components/shared/_dialogs/submit-comment/submit-comment.component.html
rename to src/app/components/shared/_dialogs/create-comment/create-comment.component.html
diff --git a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.scss b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
similarity index 100%
rename from src/app/components/shared/_dialogs/submit-comment/submit-comment.component.scss
rename to src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
diff --git a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.spec.ts b/src/app/components/shared/_dialogs/create-comment/create-comment.component.spec.ts
similarity index 53%
rename from src/app/components/shared/_dialogs/submit-comment/submit-comment.component.spec.ts
rename to src/app/components/shared/_dialogs/create-comment/create-comment.component.spec.ts
index 730881f3daa422eb190a18e9dc1b3e73fbdd6d99..6d6dbdc0e384f8006127bfc5870b65726c4be1e7 100644
--- a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.spec.ts
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.spec.ts
@@ -1,21 +1,21 @@
 /*
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SubmitCommentComponent } from './submit-comment.component';
+import { CreateCommentComponent } from './create-comment.component';
 
-describe('SubmitCommentComponent', () => {
-  let component: SubmitCommentComponent;
-  let fixture: ComponentFixture<SubmitCommentComponent>;
+describe('CreateCommentComponent', () => {
+  let component: CreateCommentComponent;
+  let fixture: ComponentFixture<CreateCommentComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SubmitCommentComponent ]
+      declarations: [ CreateCommentComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SubmitCommentComponent);
+    fixture = TestBed.createComponent(CreateCommentComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.ts b/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
similarity index 92%
rename from src/app/components/shared/_dialogs/submit-comment/submit-comment.component.ts
rename to src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
index 52aa288d8422f673d465051ff6defbfbf50edaff..42965ca081bc69f6dc45e385577ab0b87d538275 100644
--- a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.ts
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
@@ -10,10 +10,10 @@ import { CommentListComponent } from '../../comment-list/comment-list.component'
 
 @Component({
   selector: 'app-submit-comment',
-  templateUrl: './submit-comment.component.html',
-  styleUrls: ['./submit-comment.component.scss']
+  templateUrl: './create-comment.component.html',
+  styleUrls: ['./create-comment.component.scss']
 })
-export class SubmitCommentComponent implements OnInit {
+export class CreateCommentComponent implements OnInit {
 
   comment: Comment;
 
diff --git a/src/app/components/shared/comment-list/comment-list.component.html b/src/app/components/shared/comment-list/comment-list.component.html
index 9187f1a081014663f475b193d187478839e35439..fdb59baaff69bfe4619b312e00df13de83266dcd 100644
--- a/src/app/components/shared/comment-list/comment-list.component.html
+++ b/src/app/components/shared/comment-list/comment-list.component.html
@@ -15,7 +15,7 @@
   </button>
 
   <button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value"
-          color="accent" (click)="openSubmitDialog()">
+          color="accent" (click)="openCreateDialog()">
     <mat-icon class="searchBarIcon">add_circle</mat-icon>
   </button>
 
@@ -56,10 +56,6 @@
   </mat-menu>
 </div>
 
-<mat-card class="outer-card" *ngIf="user.role === 0">
-  <app-comment *ngFor="let current of getCommentsParticipant()" [comment]="current"></app-comment>
+<mat-card class="outer-card">
+  <app-comment *ngFor="let current of showComments()" [comment]="current"></app-comment>
 </mat-card>
-<mat-card class="outer-card" *ngIf="user.role === 1">
-  <app-comment *ngFor="let current of getCommentsCreator()" [comment]="current"></app-comment>
-</mat-card>
-
diff --git a/src/app/components/shared/comment-list/comment-list.component.ts b/src/app/components/shared/comment-list/comment-list.component.ts
index b203f63ae40e9d19227150e0e7d63e30691eea77..cb4e62089f42b925e4f7829dbd751950dd779b2d 100644
--- a/src/app/components/shared/comment-list/comment-list.component.ts
+++ b/src/app/components/shared/comment-list/comment-list.component.ts
@@ -4,7 +4,7 @@ import { CommentService } from '../../../services/http/comment.service';
 import { TranslateService } from '@ngx-translate/core';
 import { LanguageService } from '../../../services/util/language.service';
 import { Message } from '@stomp/stompjs';
-import { SubmitCommentComponent } from '../_dialogs/submit-comment/submit-comment.component';
+import { CreateCommentComponent } from '../_dialogs/create-comment/create-comment.component';
 import { MatDialog } from '@angular/material';
 import { WsCommentServiceService } from '../../../services/websockets/ws-comment-service.service';
 import { User } from '../../../models/user';
@@ -70,7 +70,7 @@ export class CommentListComponent implements OnInit {
     }
   }
 
-  getCommentsCreator(): Comment[] {
+  showComments(): Comment[] {
     let commentThreshold = -10;
     if (this.room.extensions && this.room.extensions['comments']) {
       commentThreshold = this.room.extensions['comments'].commentThreshold;
@@ -88,14 +88,6 @@ export class CommentListComponent implements OnInit {
     }
   }
 
-  getCommentsParticipant(): Comment[] {
-    if (this.hideCommentsList) {
-      return this.filteredComments;
-    } else {
-      return this.comments;
-    }
-  }
-
   parseIncomingMessage(message: Message) {
     const msg = JSON.parse(message.body);
     const payload = msg.payload;
@@ -149,8 +141,8 @@ export class CommentListComponent implements OnInit {
     }
   }
 
-  openSubmitDialog(): void {
-    const dialogRef = this.dialog.open(SubmitCommentComponent, {
+  openCreateDialog(): void {
+    const dialogRef = this.dialog.open(CreateCommentComponent, {
       width: '400px'
     });
     dialogRef.componentInstance.user = this.user;
diff --git a/src/app/components/shared/shared.module.ts b/src/app/components/shared/shared.module.ts
index 13a09ef9f2f855eedc99ec50854a9fa60a48de42..6177977e4f3d53471955fa700736f3df240f6bdc 100644
--- a/src/app/components/shared/shared.module.ts
+++ b/src/app/components/shared/shared.module.ts
@@ -22,7 +22,7 @@ import { RoomCreateComponent } from './_dialogs/room-create/room-create.componen
 import { LoginComponent } from './login/login.component';
 import { StatisticHelpComponent } from './_dialogs/statistic-help/statistic-help.component';
 import { CommentComponent } from './comment/comment.component';
-import { SubmitCommentComponent } from './_dialogs/submit-comment/submit-comment.component';
+import { CreateCommentComponent } from './_dialogs/create-comment/create-comment.component';
 import { PresentCommentComponent } from './_dialogs/present-comment/present-comment.component';
 
 @NgModule({
@@ -53,7 +53,7 @@ import { PresentCommentComponent } from './_dialogs/present-comment/present-comm
     LoginComponent,
     StatisticHelpComponent,
     CommentComponent,
-    SubmitCommentComponent,
+    CreateCommentComponent,
     PresentCommentComponent
   ],
   exports: [
@@ -71,14 +71,14 @@ import { PresentCommentComponent } from './_dialogs/present-comment/present-comm
     CommentPageComponent,
     CommentListComponent,
     StatisticsPageComponent,
-    SubmitCommentComponent,
+    CreateCommentComponent,
     PresentCommentComponent
   ],
   entryComponents: [
     RoomCreateComponent,
     LoginComponent,
     StatisticHelpComponent,
-    SubmitCommentComponent,
+    CreateCommentComponent,
     PresentCommentComponent
   ]
 })