diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 2ab86cea19fe6b85b5966799e9cd504634163970..7d4408707ad50f7f5f48e908d18be3bb29c0c90b 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -3,10 +3,12 @@ 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';
 
 const routes: Routes = [
-  { path: 'home', component: LoginScreenComponent },
   { path: '', redirectTo: '/home', pathMatch: 'full' },
+  { path: 'home', component: LoginScreenComponent },
+  { path: 'creator', component: CreatorHomeScreenComponent },
   { path: 'room/:roomId', component: RoomComponent },
   { path: '**', component: PageNotFoundComponent }
 ];
diff --git a/src/app/app.component.html b/src/app/app.component.html
index b55ce601b2a6685c2f2a9d85cbb8cb4f754705cb..31025d8393b4a08990b7f93f677806ce4e3f414b 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -7,7 +7,7 @@
       <!-- Insert navigation module here -->
     </mat-toolbar-row>
   </mat-toolbar>
-  <div fxFlex>
+  <div fxFlex class="app-component">
     <router-outlet></router-outlet>
   </div>
 </div>
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index c169acb90f6ac95bfeb6426745f5c0ada2d25827..c26b99e0b7c7e98c7ab546630dc2c40fe8160dac 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -1 +1,5 @@
 @import '../theme/_variables.scss';
+
+.app-component {
+  padding: 20px;
+}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2247a617e81b52bb5658e6c7f1bc8f10cd331043..f8a7e1ac4efd363f947f208b45543738ce33e990 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -57,6 +57,7 @@ import { AuthenticationService } from './authentication.service';
 import { AuthenticationGuard } from './authentication.guard';
 import { RoomService } from './room.service';
 import { RoomListComponent } from './room-list/room-list.component';
+import { CreatorHomeScreenComponent } from './creator-home-screen/creator-home-screen.component';
 
 @NgModule({
   declarations: [
@@ -71,7 +72,8 @@ import { RoomListComponent } from './room-list/room-list.component';
     RoomComponent,
     RegisterComponent,
     RoomCreationComponent,
-    RoomListComponent
+    RoomListComponent,
+    CreatorHomeScreenComponent
   ],
   entryComponents: [
     RegisterComponent,
diff --git a/src/app/creator-home-screen/creator-home-screen.component.html b/src/app/creator-home-screen/creator-home-screen.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..6a723c40049c481464ac253f56c4310990503119
--- /dev/null
+++ b/src/app/creator-home-screen/creator-home-screen.component.html
@@ -0,0 +1,8 @@
+<div fxLayout="column" fxLayoutAlign="start" fxLayoutGap="20px" fxFill>
+  <div fxLayout="row" fxLayoutAlign="center">
+    <button mat-raised-button color="primary">Create new room</button>
+  </div>
+  <div fxLayout="row" fxLayoutAlign="center">
+    <app-room-list></app-room-list>
+  </div>
+</div>
diff --git a/src/app/creator-home-screen/creator-home-screen.component.scss b/src/app/creator-home-screen/creator-home-screen.component.scss
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/app/creator-home-screen/creator-home-screen.component.spec.ts b/src/app/creator-home-screen/creator-home-screen.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..def2c0faf4ecf9a7241756be0dce7d655d1da83a
--- /dev/null
+++ b/src/app/creator-home-screen/creator-home-screen.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CreatorHomeScreenComponent } from './creator-home-screen.component';
+
+describe('CreatorHomeScreenComponent', () => {
+  let component: CreatorHomeScreenComponent;
+  let fixture: ComponentFixture<CreatorHomeScreenComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CreatorHomeScreenComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CreatorHomeScreenComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/creator-home-screen/creator-home-screen.component.ts b/src/app/creator-home-screen/creator-home-screen.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..774e90b5b7f59f9eccc2a04e2cc421086c1ce37f
--- /dev/null
+++ b/src/app/creator-home-screen/creator-home-screen.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-creator-home-screen',
+  templateUrl: './creator-home-screen.component.html',
+  styleUrls: ['./creator-home-screen.component.scss']
+})
+export class CreatorHomeScreenComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
index 145d3f5c11f6f51d0d8c4d2c181de85801c26663..0e244318e437b61182522fb94ba9ce32ddbe42f3 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@@ -40,7 +40,7 @@ export class LoginComponent implements OnInit {
       this.authenticationService.login(username, password).subscribe(loginSuccessful => {
         if (loginSuccessful) {
           this.notificationService.show('Login successful!');
-          this.router.navigate(['rooms']);
+          this.router.navigate(['creator']);
         } else {
           this.notificationService.show('Login failed!');
         }
diff --git a/src/app/room-list/room-list.component.html b/src/app/room-list/room-list.component.html
index 5c96b0160fa03bc126ea52648f8037ae6535a916..3e2cbb1f4f38a6be1d03dde3f4c32c03206e3466 100644
--- a/src/app/room-list/room-list.component.html
+++ b/src/app/room-list/room-list.component.html
@@ -1,6 +1,6 @@
 <mat-list>
   <mat-list-item *ngFor="let room of rooms">
-    <button mat-button routerLink="room/{{room.id}}">
+    <button mat-button routerLink="/room/{{room.id}}">
       {{room.name}}
     </button>
   </mat-list-item>