diff --git a/src/app/answer-text.ts b/src/app/answer-text.ts
index 14ad4417202cac7237eae0f178acf65f947ceca2..b2014e2d8dcf7bcc12a50cdb48563dcef2766ff9 100644
--- a/src/app/answer-text.ts
+++ b/src/app/answer-text.ts
@@ -1,7 +1,7 @@
 export class AnswerText {
   id: string;
   revision: string;
-  contendId: string;
+  contentId: string;
   round: number;
   subject: string;
   body: string;
diff --git a/src/app/content-answer.service.ts b/src/app/content-answer.service.ts
index 7bbded13127dac19355fb86d2f22b18179a4d2bc..e414d1d2ac4bcfa1eec16cea94ad9624f84f5eb6 100644
--- a/src/app/content-answer.service.ts
+++ b/src/app/content-answer.service.ts
@@ -4,14 +4,12 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { catchError, tap } from 'rxjs/operators';
 import { ErrorHandlingService } from './error-handling.service';
-
 const httpOptions = {
   headers: new HttpHeaders({ 'Content-Type': 'application/json' })
 };
 
 @Injectable()
 export class ContentAnswerService extends ErrorHandlingService {
-
   private answerUrl = 'api/answerTexts';
 
   constructor(private http: HttpClient) {
@@ -20,14 +18,12 @@ export class ContentAnswerService extends ErrorHandlingService {
 
   getAnswerTexts(): Observable<AnswerText[]> {
     return this.http.get<AnswerText[]>(this.answerUrl).pipe(
-      tap(_ => ''),
       catchError(this.handleError('getAnswerTexts', []))
     );
   }
 
   addAnswerText(answerText: AnswerText): Observable<AnswerText> {
     return this.http.post<AnswerText>(this.answerUrl, answerText, httpOptions).pipe(
-      tap(_ => ''),
       catchError(this.handleError<AnswerText>('addAnswerText'))
     );
   }
@@ -35,9 +31,7 @@ export class ContentAnswerService extends ErrorHandlingService {
   getAnswerText(id: string): Observable<AnswerText> {
     const url = `${this.answerUrl}/${id}`;
     return this.http.get<AnswerText>(url).pipe(
-      tap(_ => ''),
       catchError(this.handleError<AnswerText>(`getAnswerText id=${id}`))
     );
   }
-
 }
diff --git a/src/app/content-answers-list/content-answers-list.component.html b/src/app/content-answers-list/content-answers-list.component.html
index 8c691ac465c67288327f0ef7b2bce58164618d46..d1205e828c48078f9500b29a95674ca9d06dd6e0 100644
--- a/src/app/content-answers-list/content-answers-list.component.html
+++ b/src/app/content-answers-list/content-answers-list.component.html
@@ -1,9 +1,8 @@
 <mat-list>
-    <h3 mat-subheader>Answers</h3>
-    <mat-list-item *ngFor="let textAnswer of textAnswers">
-      <button mat-button routerLink="{{textAnswer.id}}">
-          {{textAnswer.body}}
-      </button>
-    </mat-list-item>
-  </mat-list>
-  
\ No newline at end of file
+  <h3 mat-subheader>Answers</h3>
+  <mat-list-item *ngFor="let textAnswer of textAnswers">
+    <button mat-button routerLink="{{textAnswer.id}}">
+      {{textAnswer.body}}
+    </button>
+  </mat-list-item>
+</mat-list>
\ No newline at end of file
diff --git a/src/app/content-answers-list/content-answers-list.component.ts b/src/app/content-answers-list/content-answers-list.component.ts
index 1b9efed7c56b19e7210980d2170199c244f8c291..f12737a546ee0f8effa428b7dd7c30a3b94de2a8 100644
--- a/src/app/content-answers-list/content-answers-list.component.ts
+++ b/src/app/content-answers-list/content-answers-list.component.ts
@@ -10,17 +10,16 @@ import { AnswerText } from '../answer-text';
 export class ContentAnswersListComponent implements OnInit {
   textAnswers: AnswerText[];
 
-  constructor(private ContentAnswerService: ContentAnswerService ) { }
+  constructor(private contentAnswerService: ContentAnswerService ) { }
 
   ngOnInit() {
     this.getAnswerTexts();
   }
 
   getAnswerTexts(): void {
-    this.ContentAnswerService.getAnswerTexts().
+    this.contentAnswerService.getAnswerTexts().
     subscribe(textAnswers => {
       this.textAnswers = textAnswers;
     })
   }
-
 }
diff --git a/src/app/content-creation/content-creation.component.scss b/src/app/content-creation/content-creation.component.scss
index 4f268d8cd9826f5679d8129b6778a657f7280adf..ed600034848f739d3824f93fe847dbe25f91693d 100644
--- a/src/app/content-creation/content-creation.component.scss
+++ b/src/app/content-creation/content-creation.component.scss
@@ -1,4 +1,4 @@
 .content-card {
     max-width: 400px;
-    margin: 5%;
+    margin: 10px;
 }
diff --git a/src/app/content-detail/content-detail.component.html b/src/app/content-detail/content-detail.component.html
index 1abb21f9a347875bf53cee32d46071db20278fc4..92b0bc10dc19515df2e3417ab7f91305ad16c71a 100644
--- a/src/app/content-detail/content-detail.component.html
+++ b/src/app/content-detail/content-detail.component.html
@@ -5,7 +5,8 @@
         <mat-card-title>
           <h3 class="subheading-2">{{content.subject}}</h3>
         </mat-card-title>
-        <mat-card-subtitle>ID: {{ content.id }} <br> Round: {{ content.round }}</mat-card-subtitle>
+        <mat-card-subtitle>ID: {{ content.id }}
+          <br> Round: {{ content.round }}</mat-card-subtitle>
       </mat-card-header>
       <mat-divider></mat-divider>
       <mat-card-content>
@@ -19,15 +20,15 @@
       </mat-card-content>
       <mat-divider></mat-divider>
       <!-- answes list here -->
-    <mat-card-actions>
+      <mat-card-actions>
         <button mat-button color="primary" matTooltip="Create new content" routerLink="/creator/room/{{content.id}}/content-creation">
           Create answer
         </button>
-        <button mat-button color="warn" matTooltip="Delete selected answer"> <!-- on click, add a 'x' on the right end of each answer to make it deletable -->
+        <button mat-button color="warn" matTooltip="Delete selected answer">
+          <!-- on click, add a 'x' on the right end of each answer to make it deletable -->
           Delete answer
         </button>
-      
-    </mat-card-actions>
-  </mat-card>
+      </mat-card-actions>
+    </mat-card>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/content-detail/content-detail.component.scss b/src/app/content-detail/content-detail.component.scss
index af7e42df3d9cf4c0866d4815df1beef3888caa29..78348d75ebc905c70ce1c8c0e6b0596305491911 100644
--- a/src/app/content-detail/content-detail.component.scss
+++ b/src/app/content-detail/content-detail.component.scss
@@ -1,8 +1,8 @@
 mat-card {
-    max-width: 800px;
-  }
+  max-width: 800px;
+}
   
-  mat-card-content > :first-child {
-    margin-top: 16px;
-  }
+mat-card-content > :first-child {
+  margin-top: 16px;
+}
   
\ No newline at end of file
diff --git a/src/app/content-list/content-list.component.ts b/src/app/content-list/content-list.component.ts
index 71828d595d1ed8e9c4241c78180bbda297ddbdb7..4fddce67c735ec8276ab9128b08ef09b26bcc076 100644
--- a/src/app/content-list/content-list.component.ts
+++ b/src/app/content-list/content-list.component.ts
@@ -10,14 +10,14 @@ import { Content } from '../content';
 export class ContentListComponent implements OnInit {
   contents: Content[];
 
-  constructor(private ContentService: ContentService) { }
+  constructor(private contentService: ContentService) { }
 
   ngOnInit() {
     this.getContents();
   }
 
   getContents(): void {
-    this.ContentService.getContents()
+    this.contentService.getContents()
     .subscribe(contents => {
       this.contents = contents;
     });
diff --git a/src/app/content.service.ts b/src/app/content.service.ts
index 438e9f5e9ecb5eb026fa78be0ec80f8feee27165..c6ae7385ddb8c52ade51ed1f5fffe56416b1239a 100644
--- a/src/app/content.service.ts
+++ b/src/app/content.service.ts
@@ -4,7 +4,6 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { catchError, tap } from 'rxjs/operators';
 import { ErrorHandlingService } from './error-handling.service';
-
 const httpOptions = {
   headers: new HttpHeaders({ 'Content-Type': 'application/json' })
 };
@@ -20,14 +19,12 @@ export class ContentService extends ErrorHandlingService {
 
   getContents(): Observable<Content[]> {
     return this.http.get<Content[]>(this.contentUrl).pipe(
-      tap(_ => ''),
       catchError(this.handleError('getContents', []))
     );
   }
 
   addContent(content: Content): Observable<Content> {
     return this.http.post<Content>(this.contentUrl, content, httpOptions).pipe(
-      tap(_ => ''),
       catchError(this.handleError<Content>('addContent'))
     );
   }
@@ -35,9 +32,7 @@ export class ContentService extends ErrorHandlingService {
   getContent(id: string): Observable<Content> {
     const url = `${this.contentUrl}/${id}`;
     return this.http.get<Content>(url).pipe(
-      tap(_ => ''),
       catchError(this.handleError<Content>(`getContent id=${id}`))
     );
   }
-
 }
diff --git a/src/app/content.ts b/src/app/content.ts
index 8ed673db700a2ddfa93167eaa794b4ca40513704..f8069e8117c8840f9fe5a0ac8b7fc9363f5b3b9e 100644
--- a/src/app/content.ts
+++ b/src/app/content.ts
@@ -15,5 +15,5 @@ export class Content {
   body: string;
   round: number;
   format: Format;
-   // formatAttributes: Map<string, string>;
+  formatAttributes: Map<string, string>;
 }