diff --git a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts
index 54b09194e6d80315b63d4506ddfb6866bf38eb4a..45e5b34694810a9cba23cbfca879c51a5e932de2 100644
--- a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts
+++ b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts
@@ -5,6 +5,7 @@ import { ContentService } from '../../../services/http/content.service';
 import { NotificationService } from '../../../services/util/notification.service';
 import { MatDialog } from '@angular/material';
 import { AnswerEditComponent } from '../../dialogs/answer-edit/answer-edit.component';
+import { ContentType } from '../../../models/content-type.enum';
 
 export class DisplayAnswer {
   answerOption: AnswerOption;
@@ -32,7 +33,8 @@ export class ContentChoiceCreatorComponent implements OnInit {
     1,
     [],
     [],
-    true);
+    true,
+    ContentType.CHOICE);
 
   displayedColumns = ['label', 'points', 'actions'];
 
@@ -233,9 +235,11 @@ export class ContentChoiceCreatorComponent implements OnInit {
     }
     if (this.singleChoice) {
       this.content.multiple = false;
+      this.content.format = ContentType.BINARY;
     }
     if (this.multipleChoice) {
       this.content.multiple = true;
+      this.content.format = ContentType.CHOICE;
     }
     this.notificationService.show('Content submitted.');
     /*   if (this.content.contentId === '0') {
diff --git a/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts b/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts
index 43436821689d0d71ac9c6e0ab44d09832a8d2d34..d4472e75373183560a654c07f0bfa6ced5263d22 100644
--- a/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts
+++ b/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts
@@ -41,7 +41,8 @@ export class ContentChoiceParticipantComponent implements OnInit {
       new AnswerOption('Option 4', '30')
     ],
     [2, 3, 4],
-    false);
+    false,
+    ContentType.BINARY);
   checkedAnswers: CheckedAnswer[] = [];
   isAnswerSent = false;
 
diff --git a/src/app/components/fragments/content-likert-creator/content-likert-creator.component.ts b/src/app/components/fragments/content-likert-creator/content-likert-creator.component.ts
index e87b1ed5611af9c47440b334144cae7364c576c6..02ce99c3325be7db66e2e512d6148ebdb0d42493 100644
--- a/src/app/components/fragments/content-likert-creator/content-likert-creator.component.ts
+++ b/src/app/components/fragments/content-likert-creator/content-likert-creator.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { DisplayAnswer } from '../content-choice-creator/content-choice-creator.component';
 import { ContentChoice } from '../../../models/content-choice';
 import { AnswerOption } from '../../../models/answer-option';
+import { ContentType } from '../../../models/content-type.enum';
 
 @Component({
   selector: 'app-content-likert-creator',
@@ -25,12 +26,13 @@ export class ContentLikertCreatorComponent implements OnInit {
     1,
     [],
     [],
-    false);
+    false,
+    ContentType.SCALE);
 
   displayedColumns = ['label'];
 
   displayAnswers: DisplayAnswer[] = [];
-  newAnswerOptionPoints = '';
+  newAnswerOptionPoints = '0';
 
   constructor() {
   }
diff --git a/src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.ts b/src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.ts
index 351a5263ae702afb39071f17122fcef929d15659..3e3839047d58f83365605cfdd6c35b1fccc5fbbd 100644
--- a/src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.ts
+++ b/src/app/components/fragments/content-yes-no-creator/content-yes-no-creator.component.ts
@@ -3,6 +3,7 @@ import { ContentChoice } from '../../../models/content-choice';
 import { DisplayAnswer } from '../content-choice-creator/content-choice-creator.component';
 import { AnswerOption } from '../../../models/answer-option';
 import { NotificationService } from '../../../services/util/notification.service';
+import { ContentType } from '../../../models/content-type.enum';
 
 @Component({
   selector: 'app-content-yes-no-creator',
@@ -22,7 +23,9 @@ export class ContentYesNoCreatorComponent implements OnInit {
     1,
     [],
     [],
-    false);
+    false,
+    ContentType.BINARY
+    );
 
   displayedColumns = ['label'];
 
diff --git a/src/app/components/pages/content-carousel-page/content-carousel-page.component.ts b/src/app/components/pages/content-carousel-page/content-carousel-page.component.ts
index 982bda99f80483fbc3e4c0e6a09e3c0d11d37333..f61e255778538ea239b5805bc9ebd3ef9053f9ac 100644
--- a/src/app/components/pages/content-carousel-page/content-carousel-page.component.ts
+++ b/src/app/components/pages/content-carousel-page/content-carousel-page.component.ts
@@ -1,5 +1,4 @@
 import { Component, OnInit } from '@angular/core';
-import { Content } from '../../../models/content';
 import { ContentType } from '../../../models/content-type.enum';
 import { AnswerOption } from '../../../models/answer-option';
 import { ContentChoice } from '../../../models/content-choice';
@@ -26,22 +25,39 @@ export class ContentCarouselPageComponent implements OnInit {
       1,
       [new AnswerOption('yes', ''), new AnswerOption('no', '')],
       [],
-      true),
+      true,
+      ContentType.CHOICE),
     new ContentChoice('0',
       '1',
       'roomId2',
       'SingleChoice Subject',
-      'SingleChoide Body',
+      'SingleChoice Body',
       1,
       [new AnswerOption('may', ''), new AnswerOption('not', '')],
       [],
-      false),
+      false,
+      ContentType.BINARY),
     new ContentText('1',
       '1',
-      '0',
+      'roomId3',
       'TextContent Subject',
       'TextContent Body',
-      1)
+      1),
+    new ContentChoice('0',
+      '1',
+      'roomId4',
+      'LikertContent Subjekt',
+      'LikertContent Body',
+      1,
+      [
+        new AnswerOption('Strongly agree', '0'),
+        new AnswerOption('Agree', '0'),
+        new AnswerOption('Neither agree nor disagree', '0'),
+        new AnswerOption('Disagree', '0' ),
+      new AnswerOption('Strongly disagree', '0') ],
+      [],
+      false,
+      ContentType.SCALE)
   ];
 
   constructor(private contentService: ContentService,
diff --git a/src/app/models/content-choice.ts b/src/app/models/content-choice.ts
index 25cb9927d2c6e058c1b0fa94b7eebd66d5f372a5..6bca40dbb5dce9934821ad755d9a94d0e3d5e60f 100644
--- a/src/app/models/content-choice.ts
+++ b/src/app/models/content-choice.ts
@@ -15,14 +15,15 @@ export class ContentChoice extends Content {
               round: number,
               options: AnswerOption[],
               correctOptionIndexes: number[],
-              multiple: boolean) {
+              multiple: boolean,
+              format: ContentType) {
     super(contentId,
       revision,
       roomId,
       subject,
       body,
       round,
-      ContentType.CHOICE,
+      format,
       new Map());
       this.options = options;
       this.correctOptionIndexes = correctOptionIndexes;