diff --git a/WEB/src/app/components/songs/song-edit/song-edit.component.html b/WEB/src/app/components/songs/song-edit/song-edit.component.html
index 4a76b48..f63ed0c 100644
--- a/WEB/src/app/components/songs/song-edit/song-edit.component.html
+++ b/WEB/src/app/components/songs/song-edit/song-edit.component.html
@@ -7,7 +7,7 @@
         </button>
       </div>
       <mat-card-title>Titel bearbeiten</mat-card-title>
-      <!-- <mat-card-subtitle>{{ song.Key }} - {{ song.Tempo }}</mat-card-subtitle> -->
+      <mat-card-subtitle>Daten werden nach der Eingabe automatisch gespeichert</mat-card-subtitle>
     </mat-card-header>
     <mat-card-content>
       <form>
@@ -47,6 +47,14 @@
             [matTextareaAutosize]="true"
           ></textarea>
         </mat-form-field>
+        <mat-form-field>
+            <textarea
+              matInput
+              placeholder="Kommentare"
+              [formControl]="form.controls.Comments"
+              [matTextareaAutosize]="true"
+            ></textarea>
+          </mat-form-field>
       </form>
     </mat-card-content>
     <!-- <mat-card-actions>
diff --git a/WEB/src/app/components/songs/song/song.component.html b/WEB/src/app/components/songs/song/song.component.html
index f3d541d..36ec21a 100644
--- a/WEB/src/app/components/songs/song/song.component.html
+++ b/WEB/src/app/components/songs/song/song.component.html
@@ -11,6 +11,8 @@
     </mat-card-header>
     <mat-card-content>
       <p *ngFor="let line of text">{{ line }}</p>
+      <br />
+      <p *ngFor="let line of comments">{{ line }}</p>
     </mat-card-content>
     <mat-card-actions>
       <button mat-button (click)="onClickDownload()">Herunterladen</button>
diff --git a/WEB/src/app/components/songs/song/song.component.less b/WEB/src/app/components/songs/song/song.component.less
index eaa043b..7dfd362 100644
--- a/WEB/src/app/components/songs/song/song.component.less
+++ b/WEB/src/app/components/songs/song/song.component.less
@@ -1,22 +1,4 @@
-.mat-card {
-  width: 500px;
-  border-radius: 8px;
-  background: #fffe;
-  margin: 20px;
-  box-sizing: border-box;
-}
-
-.mat-card-title {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  width: 420px;
-}
-
-.mat-card-content {
-  white-space: pre-wrap;
-}
-
-.song-detail-container {
-  margin-left: 30vw;
-}
+p {
+  margin: 0;
+  min-height: 10px;
+}
\ No newline at end of file
diff --git a/WEB/src/app/components/songs/song/song.component.ts b/WEB/src/app/components/songs/song/song.component.ts
index ba1680d..11dc140 100644
--- a/WEB/src/app/components/songs/song/song.component.ts
+++ b/WEB/src/app/components/songs/song/song.component.ts
@@ -52,6 +52,10 @@ export class SongComponent {
   }
 
   public get text(): string[] {
-    return this.song.Text.split(/\r?\n/).filter(_ => _ !== ' ');
+    return this.song.Text ? this.song.Text.split(/\r?\n/) : [];
+  }
+
+  public get comments(): string[] {
+    return this.song.Comments ? this.song.Comments.split(/\r?\n/) : [];
   }
 }
diff --git a/WEB/src/app/data/edit-song.service.ts b/WEB/src/app/data/edit-song.service.ts
index a2d6de3..ef5d67b 100644
--- a/WEB/src/app/data/edit-song.service.ts
+++ b/WEB/src/app/data/edit-song.service.ts
@@ -1,27 +1,40 @@
-import { Song } from 'src/app/models/song.model';
 import { SongsService } from 'src/app/data/songs.service';
 import { Injectable } from '@angular/core';
 import { FormGroup, FormControl, Validators } from '@angular/forms';
+import { switchMap, tap } from 'rxjs/operators';
 
 @Injectable({
   providedIn: 'root'
 })
 export class EditSongService {
+  constructor(private songsService: SongsService) {}
 
-    constructor(private songsService: SongsService) { }
+  public initEditForm(): FormGroup {
+    const song = this.songsService.selectedSong.value;
+    const form = new FormGroup({
+      ID: new FormControl(song.ID, { updateOn: 'blur' }),
+      Number: new FormControl(song.Number, { updateOn: 'blur' }),
+      Name: new FormControl(song.Name, {
+        updateOn: 'blur',
+        validators: Validators.required
+      }),
+      Text: new FormControl(song.Text, { updateOn: 'blur' }),
+      SongType: new FormControl(song.SongType, {
+        updateOn: 'blur',
+        validators: Validators.required
+      }),
+      Key: new FormControl(song.Key, { updateOn: 'blur' }),
+      Tempo: new FormControl(song.Tempo, { updateOn: 'blur' }),
+      Comments: new FormControl(song.Comments, { updateOn: 'blur' }),
+    });
 
-    public initEditForm(): FormGroup {
-        const song = this.songsService.selectedSong.value;
-        const form = new FormGroup({
-            ID: new FormControl(song.ID),
-            Number: new FormControl(song.Number),
-            Name: new FormControl(song.Name, Validators.required),
-            Text: new FormControl(song.Text),
-            SongType: new FormControl(song.SongType, Validators.required),
-            Key: new FormControl(song.Key),
-            Tempo: new FormControl(song.Tempo)
-        });
+    const controls = Object.keys(form.controls);
+    controls.forEach(control => {
+      form.controls[control].valueChanges.pipe(
+        switchMap(value => this.songsService.patch(song.ID, control, value))
+      ).subscribe();
+    });
 
-        return form;
-    }
+    return form;
+  }
 }
diff --git a/WEB/src/app/data/odata.service.ts b/WEB/src/app/data/odata.service.ts
index 368b4e6..3f1a8e3 100644
--- a/WEB/src/app/data/odata.service.ts
+++ b/WEB/src/app/data/odata.service.ts
@@ -1,29 +1,45 @@
-import { ODataService, ODataQuery } from 'odata-v4-ng';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { base } from './urls';
+import { ODataService, ODataQuery } from "odata-v4-ng";
+import { Observable } from "rxjs";
+import { map, tap } from "rxjs/operators";
+import { base } from "./urls";
 
 export class OdataService {
   private url: string;
   constructor(private odataService: ODataService, private entity: string) {
-    this.url = base + '/odata/';
+    this.url = base + "/odata/";
   }
 
-  public list<TResponse>(): Observable<TResponse[]> {
-    const query = new ODataQuery(this.odataService, this.url).entitySet(
-      this.entity
-    );
+  public list<TResponse>(properties: string[]): Observable<TResponse[]> {
+    const query = new ODataQuery(this.odataService, this.url)
+      .entitySet(this.entity)
+      .select(properties);
     const get = query.get().pipe(map(_ => _.toPropertyValue<TResponse[]>()));
 
     return get;
   }
 
-  public get<TResponse>(id: number): Observable<TResponse> {
+  public get<TResponse>(
+    id: number,
+    properties: string[]
+  ): Observable<TResponse> {
     const query = new ODataQuery(this.odataService, this.url)
       .entitySet(this.entity)
-      .entityKey(id);
+      .entityKey(id)
+      .select(properties);
     const get = query.get().pipe(map(_ => _.toEntity<TResponse>()));
 
     return get;
   }
+
+  public patch(id: number, control: string, value: any): Observable<boolean> {
+    const valueSet = { [control]: value };
+    const query = new ODataQuery(this.odataService, this.url)
+      .entitySet(this.entity)
+      .entityKey(id);
+    const get = query.patch(valueSet).pipe(
+      map(() => true)
+    );
+
+    return get;
+  }
 }
diff --git a/WEB/src/app/data/songs.service.ts b/WEB/src/app/data/songs.service.ts
index f902f77..880a8e9 100644
--- a/WEB/src/app/data/songs.service.ts
+++ b/WEB/src/app/data/songs.service.ts
@@ -2,7 +2,8 @@ import { Injectable } from '@angular/core';
 import { ODataService } from 'odata-v4-ng';
 import { OdataService } from './odata.service';
 import { Song } from '../models/song.model';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { tap } from 'rxjs/operators';
 
 @Injectable({
   providedIn: 'root'
@@ -18,17 +19,39 @@ export class SongsService extends OdataService {
   }
 
   public loadSongList(): void {
-    this.list<Song>().subscribe(_ => this.songs.next(_));
+    const properties = ['ID', 'Name', 'Number', 'SongType', 'Key', 'Tempo'];
+    this.list<Song>(properties).subscribe(_ => this.songs.next(_));
   }
 
   public selectSong(id: number): void {
     this.edit = false;
     const filter = this.songs.value.filter(_ => _.ID === id);
     const song = filter.length === 1 ? filter[0] : null;
-    this.selectedSong.next(song);
+    if (!song) {
+      return;
+    }
+
+    this.get<Song>(id, ['Text', 'Comments']).subscribe(_ => {
+      song.Text = _.Text;
+      song.Comments = _.Comments;
+      this.selectedSong.next(song);
+    });
   }
 
   public resetSelectedSong() {
     this.selectedSong.next(null);
   }
+
+  public patch(id: number, control: string, value: any): Observable<boolean> {
+    const patch = super.patch(id, control, value).pipe(
+      tap(() => {
+        const songs = this.songs.value;
+        const song = songs.filter(_ => _.ID === id)[0];
+        song[control] = value;
+        this.songs.next(songs);
+        this.selectedSong.next(song);
+      })
+    );
+    return patch;
+  }
 }
diff --git a/WEB/src/app/data/urls.ts b/WEB/src/app/data/urls.ts
index a951835..0214ac7 100644
--- a/WEB/src/app/data/urls.ts
+++ b/WEB/src/app/data/urls.ts
@@ -1 +1,2 @@
-export const base = 'http://test.benjamin-ifland.de/';
+// export const base = 'http://192.168.178.20/API';
+export const base = 'http://test.benjamin-ifland.de';
diff --git a/WEB/src/app/services/animation.ts b/WEB/src/app/services/animation.ts
index da83201..6773c94 100644
--- a/WEB/src/app/services/animation.ts
+++ b/WEB/src/app/services/animation.ts
@@ -3,11 +3,11 @@ import { trigger, transition, style, animate } from '@angular/animations';
 export const blend = trigger('blend', [
     transition(':enter', [
       style({ opacity: 0 }),
-      animate('700ms', style({ opacity: 0 })),
+      animate('200ms', style({ opacity: 0 })),
       animate('300ms', style({ opacity: 1 }))
     ]),
     transition(':leave', [
       style({ opacity: 1 }),
       animate('300ms', style({ opacity: 0 }))
     ])
-  ]);
\ No newline at end of file
+  ]);
diff --git a/WEB/src/styles.less b/WEB/src/styles.less
index 21bf707..68d2757 100644
--- a/WEB/src/styles.less
+++ b/WEB/src/styles.less
@@ -73,7 +73,7 @@ html {
 }
 
 .mat-card {
-  width: 500px;
+  width: 600px;
   border-radius: 8px;
   background: #fffd;
   margin: 20px;
@@ -84,7 +84,7 @@ html {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  width: 420px;
+  width: 520px;
 }
 
 .mat-card-content {