diff --git a/src/app/app.component.html b/src/app/app.component.html
index 31025d8393b4a08990b7f93f677806ce4e3f414b..b5c063dbe0a69ace77722e1b727b927589e45ff6 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -11,6 +11,3 @@
     <router-outlet></router-outlet>
   </div>
 </div>
-
-
-
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 239d930dbbdfc5038402f13510781113b50bcf08..e49dd1b22f2fd9e1982f70cc40626393c57a03a1 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -56,6 +56,7 @@ import { LoginScreenComponent } from './login-screen/login-screen.component';
 import { NotificationService } from './notification.service';
 import { AuthenticationService } from './authentication.service';
 import { AuthenticationGuard } from './authentication.guard';
+import { ContentCreationComponent } from './content-creation/content-creation.component';
 import { RoomService } from './room.service';
 import { RoomListComponent } from './room-list/room-list.component';
 import { CreatorHomeScreenComponent } from './creator-home-screen/creator-home-screen.component';
@@ -72,6 +73,7 @@ import { ParticipantHomeScreenComponent } from './participant-home-screen/partic
     PageNotFoundComponent,
     PasswordResetComponent,
     RegisterComponent,
+    ContentCreationComponent,
     RoomComponent,
     RegisterComponent,
     RoomCreationComponent,
diff --git a/src/app/content-creation/content-creation.component.html b/src/app/content-creation/content-creation.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..01347286e16cb3d0510cac053783ed6af165efdd
--- /dev/null
+++ b/src/app/content-creation/content-creation.component.html
@@ -0,0 +1,36 @@
+<div>
+  <mat-card class="content-card">
+    <mat-card-title>
+      <mat-form-field>
+        <input matInput placeholder="Topic">
+      </mat-form-field>
+    </mat-card-title>
+
+    <mat-form-field>
+      <textarea matInput placeholder="Place your text here" matTextareaAutosize matAutosizeMinRows="3" matAutosizeMaxRows="8"></textarea>
+    </mat-form-field>
+  </mat-card>
+</div>
+
+<mat-card class="content-card">
+  <mat-selection-list>
+    <mat-list-option>Answer 32</mat-list-option>
+    <mat-list-option>Answer 33</mat-list-option>
+    <mat-list-option>Answer 34</mat-list-option>
+
+    <mat-list>
+      <mat-form-field>
+        <input matInput placeholder="Add Answer">
+      </mat-form-field>
+      <button mat-mini-fab>+</button>
+    </mat-list>
+  </mat-selection-list>
+</mat-card>
+
+<button mat-raised-button="Preview">Preview</button>
+<!-- TODO: Save answers to array in a class. Show answers in a matlist -->
+
+<div>
+  <mat-slide-toggle>Allow absention</mat-slide-toggle>
+  <mat-slide-toggle>Show hints</mat-slide-toggle>
+</div>
diff --git a/src/app/content-creation/content-creation.component.scss b/src/app/content-creation/content-creation.component.scss
new file mode 100644
index 0000000000000000000000000000000000000000..b8fb3a62658b7b3f63345c8950c8cb8057964750
--- /dev/null
+++ b/src/app/content-creation/content-creation.component.scss
@@ -0,0 +1,4 @@
+.content-card {
+    max-width: 400px;
+    margin-bottom: 5%;
+}
diff --git a/src/app/content-creation/content-creation.component.spec.ts b/src/app/content-creation/content-creation.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..7e3fe7640776cbcac4113dc179a6218b12332e80
--- /dev/null
+++ b/src/app/content-creation/content-creation.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ContentCreationComponent } from './content-creation.component';
+
+describe('ContentCreationComponent', () => {
+  let component: ContentCreationComponent;
+  let fixture: ComponentFixture<ContentCreationComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ContentCreationComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ContentCreationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/content-creation/content-creation.component.ts b/src/app/content-creation/content-creation.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e80156f5e4c577c7b996638299f77449b78801fe
--- /dev/null
+++ b/src/app/content-creation/content-creation.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-content-creation',
+  templateUrl: './content-creation.component.html',
+  styleUrls: ['./content-creation.component.scss']
+})
+export class ContentCreationComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}