diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.ts b/src/Squidex/app/features/content/pages/content/content-page.component.ts
index 366529a50..0c95223a9 100644
--- a/src/Squidex/app/features/content/pages/content/content-page.component.ts
+++ b/src/Squidex/app/features/content/pages/content/content-page.component.ts
@@ -46,11 +46,9 @@ export class ContentPageComponent extends AppComponentBase implements OnDestroy,
     public contentData: any = null;
     public contentId: string;
 
-    public languages: AppLanguageDto[] = [];
+    public isNewMode = false;
 
-    public get isNewMode() {
-        return !this.contentData;
-    }
+    public languages: AppLanguageDto[] = [];
 
     constructor(apps: AppsStoreService, notifications: NotificationService, users: UsersProviderService,
         private readonly contentsService: ContentsService,
@@ -182,10 +180,12 @@ export class ContentPageComponent extends AppComponentBase implements OnDestroy,
         if (!content) {
             this.contentData = undefined;
             this.contentId = undefined;
+            this.isNewMode = false;
             return;
         } else {
             this.contentData = content.data;
             this.contentId = content.id;
+            this.isNewMode = true;
         }
 
         for (const field of this.schema.fields) {
diff --git a/src/Squidex/app/features/content/pages/contents/content-item.component.html b/src/Squidex/app/features/content/pages/contents/content-item.component.html
index 0b4af0643..30edecfe5 100644
--- a/src/Squidex/app/features/content/pages/contents/content-item.component.html
+++ b/src/Squidex/app/features/content/pages/contents/content-item.component.html
@@ -1,6 +1,6 @@
-<td *ngFor="let field of fields">
+<td *ngFor="let value of values">
     <span class="field">
-        {{getValue(field)}}
+        {{value}}
     </span>
 </td>
 <td>
@@ -16,13 +16,13 @@
             <i class="icon-dots"></i>
         </button>
         <div class="dropdown-menu" *sqxModalView="dropdown" closeAlways="true" [@fade]>
-            <a class="dropdown-item" (click)="published.emit(); $event.stopPropagation()" *ngIf="!content.isPublished">
+            <a class="dropdown-item" (click)="publishing.emit(); $event.stopPropagation()" *ngIf="!content.isPublished">
                 Publish
             </a>
-            <a class="dropdown-item" (click)="unpublished.emit(); $event.stopPropagation()" *ngIf="content.isPublished">
+            <a class="dropdown-item" (click)="unpublishing.emit(); $event.stopPropagation()" *ngIf="content.isPublished">
                 Unpublish
             </a>
-            <a class="dropdown-item" (click)="deleted.emit(); $event.stopPropagation()">
+            <a class="dropdown-item" (click)="deleting.emit(); $event.stopPropagation()">
                 Delete
             </a>
         </div>
diff --git a/src/Squidex/app/features/content/pages/contents/content-item.component.ts b/src/Squidex/app/features/content/pages/contents/content-item.component.ts
index db275740d..ede05df78 100644
--- a/src/Squidex/app/features/content/pages/contents/content-item.component.ts
+++ b/src/Squidex/app/features/content/pages/contents/content-item.component.ts
@@ -5,7 +5,7 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 import {
     AppComponentBase,
@@ -28,17 +28,17 @@ import {
         fadeAnimation
     ]
 })
-export class ContentItemComponent extends AppComponentBase {
+export class ContentItemComponent extends AppComponentBase implements OnInit {
     public dropdown = new ModalView(false, true);
 
     @Output()
-    public published = new EventEmitter<ContentDto>();
+    public publishing = new EventEmitter<ContentDto>();
 
     @Output()
-    public unpublished = new EventEmitter<ContentDto>();
+    public unpublishing = new EventEmitter<ContentDto>();
 
     @Output()
-    public deleted = new EventEmitter<ContentDto>();
+    public deleting = new EventEmitter<ContentDto>();
 
     @Input()
     public fields: FieldDto[];
@@ -52,10 +52,18 @@ export class ContentItemComponent extends AppComponentBase {
     @Input('sqxContent')
     public content: ContentDto;
 
+    public values: any[] = [];
+
     constructor(apps: AppsStoreService, notifications: NotificationService, users: UsersProviderService) {
         super(apps, notifications, users);
     }
 
+    public ngOnInit() {
+        for (let field of this.fields) {
+            this.values.push(this.getValue(field));
+        }
+    }
+
     public getValue(field: FieldDto): any {
         const contentField = this.content.data[field.name];
 
diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html
index da7114d3b..d5bcd7299 100644
--- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html
+++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html
@@ -57,9 +57,9 @@
                             [language]="languageSelected"
                             [fields]="contentFields"
                             [schema]="schema"
-                            (unpublished)="unpublishContent(content)"
-                            (published)="publishContent(content)"
-                            (deleted)="deleteContent(content)"></tr>
+                            (unpublishing)="unpublishContent(content)"
+                            (publishing)="publishContent(content)"
+                            (deleting)="deleteContent(content)"></tr>
                         <tr class="spacer"></tr>
                     </template>
                 </tbody>
diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts
index 058030d68..a4738be00 100644
--- a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts
+++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts
@@ -82,17 +82,17 @@ export class ContentsPageComponent extends AppComponentBase implements OnDestroy
     }
 
     public ngOnInit() {
-        this.messageUpdatedSubscription =
-            this.messageBus.of(ContentUpdated).subscribe(message => {
-                this.contentItems = this.contentItems.replaceAll(x => x.id === message.id, c => this.updateContent(c, true, message.data));
-            });
-
         this.messageCreatedSubscription =
             this.messageBus.of(ContentCreated).subscribe(message => {
                 this.contentTotal++;
                 this.contentItems = this.contentItems.pushFront(this.createContent(message.id, message.data));
             });
 
+        this.messageUpdatedSubscription =
+            this.messageBus.of(ContentUpdated).subscribe(message => {
+                this.updateContents(message.id, true, message.data);
+            });
+
         this.route.data.map(p => p['appLanguages']).subscribe((languages: AppLanguageDto[]) => {
             this.languages = languages;
         });
@@ -117,7 +117,7 @@ export class ContentsPageComponent extends AppComponentBase implements OnDestroy
         this.appName()
             .switchMap(app => this.contentsService.publishContent(app, this.schema.name, content.id))
             .subscribe(() => {
-                this.contentItems = this.contentItems.replaceAll(x => x.id === content.id, c => this.updateContent(c, true, content.data));
+                this.updateContents(content.id, true, content.data);
             }, error => {
                 this.notifyError(error);
             });
@@ -127,7 +127,7 @@ export class ContentsPageComponent extends AppComponentBase implements OnDestroy
         this.appName()
             .switchMap(app => this.contentsService.unpublishContent(app, this.schema.name, content.id))
             .subscribe(() => {
-                this.contentItems = this.contentItems.replaceAll(x => x.id === content.id, c => this.updateContent(c, false, content.data));
+                this.updateContents(content.id, false, content.data);
             }, error => {
                 this.notifyError(error);
             });
@@ -204,6 +204,10 @@ export class ContentsPageComponent extends AppComponentBase implements OnDestroy
         this.canGoPrev = this.currentPage > 0;
     }
 
+    private updateContents(id: string, isPublished: boolean, data: any) {
+        this.contentItems = this.contentItems.replaceAll(x => x.id === id, c => this.updateContent(c, isPublished, data));
+    }
+
     private createContent(id: string, data: any): ContentDto {
         const me = `subject:${this.authService.user!.id}`;
 
diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.html b/src/Squidex/app/features/schemas/pages/schema/field.component.html
index 461e5b45d..3bf045c2a 100644
--- a/src/Squidex/app/features/schemas/pages/schema/field.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/field.component.html
@@ -26,19 +26,19 @@
                             <i class="icon-dots"></i>
                         </button>
                         <div class="dropdown-menu" *sqxModalView="dropdown" closeAlways="true" [@fade]>
-                            <a class="dropdown-item" (click)="enabled.emit()" *ngIf="field.isDisabled">
+                            <a class="dropdown-item" (click)="enabling.emit()" *ngIf="field.isDisabled">
                                 Enable
                             </a>
-                            <a class="dropdown-item" (click)="disabled.emit()" *ngIf="!field.isDisabled">
+                            <a class="dropdown-item" (click)="disabling.emit()" *ngIf="!field.isDisabled">
                                 Disable
                             </a>
-                            <a class="dropdown-item" (click)="hidden.emit()" *ngIf="!field.isHidden">
+                            <a class="dropdown-item" (click)="hiding.emit()" *ngIf="!field.isHidden">
                                 Hide
                             </a>
-                            <a class="dropdown-item" (click)="shown.emit()" *ngIf="field.isHidden">
+                            <a class="dropdown-item" (click)="showing.emit()" *ngIf="field.isHidden">
                                 Show
                             </a>
-                            <a class="dropdown-item" (click)="deleted.emit()">
+                            <a class="dropdown-item" (click)="deleting.emit()">
                                 Delete
                             </a>
                         </div>
diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.ts b/src/Squidex/app/features/schemas/pages/schema/field.component.ts
index 23c649520..63736fe33 100644
--- a/src/Squidex/app/features/schemas/pages/schema/field.component.ts
+++ b/src/Squidex/app/features/schemas/pages/schema/field.component.ts
@@ -30,22 +30,22 @@ export class FieldComponent implements OnInit {
     public field: FieldDto;
 
     @Output()
-    public hidden = new EventEmitter<FieldDto>();
+    public hiding = new EventEmitter<FieldDto>();
 
     @Output()
-    public shown = new EventEmitter<FieldDto>();
+    public showing = new EventEmitter<FieldDto>();
 
     @Output()
-    public saved = new EventEmitter<FieldDto>();
+    public saving= new EventEmitter<FieldDto>();
 
     @Output()
-    public enabled = new EventEmitter<FieldDto>();
+    public enabling = new EventEmitter<FieldDto>();
 
     @Output()
-    public disabled = new EventEmitter<FieldDto>();
+    public disabling = new EventEmitter<FieldDto>();
 
     @Output()
-    public deleted = new EventEmitter<FieldDto>();
+    public deleting = new EventEmitter<FieldDto>();
 
     public isEditing: boolean = false;
     public selectedTab = 0;
@@ -93,7 +93,7 @@ export class FieldComponent implements OnInit {
                     this.field.isHidden,
                     properties);
 
-            this.saved.emit(field);
+            this.saving.emit(field);
         }
     }
 
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts
index 0a1e18dcb..ad015afef 100644
--- a/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts
+++ b/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts
@@ -59,6 +59,11 @@ export class SchemaEditFormComponent implements OnInit {
         this.editForm.patchValue(this.schema);
     }
 
+    public cancel() {
+        this.reset();
+        this.cancelled.emit();
+    }
+
     public saveSchema() {
         this.editFormSubmitted = true;
 
@@ -78,13 +83,8 @@ export class SchemaEditFormComponent implements OnInit {
         }
     }
 
-    public reset() {
+    private reset() {
         this.editFormSubmitted = false;
         this.editForm.reset();
     }
-
-    public cancel() {
-        this.reset();
-        this.cancelled.emit();
-    }
 }
\ No newline at end of file
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
index b221b9ccf..66f082e51 100644
--- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
@@ -28,12 +28,12 @@
         <div class="panel-content">
             <div *ngFor="let field of schemaFields">
                 <sqx-field [field]="field"
-                    (disabled)="disableField(field)"
-                    (deleted)="deleteField(field)"
-                    (enabled)="enableField(field)"
-                    (hidden)="hideField(field)"
-                    (saved)="saveField(field, $event)"
-                    (shown)="showField(field)"></sqx-field>
+                    (disabling)="disableField(field)"
+                    (deleting)="deleteField(field)"
+                    (enabling)="enableField(field)"
+                    (showing)="showField(field)"
+                    (hiding)="hideField(field)"
+                    (saving)="saveField(field, $event)"></sqx-field>
             </div>
             
             <div class="table-items-footer">
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts
index 6eed90e3d..fb6609893 100644
--- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts
+++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts
@@ -217,13 +217,13 @@ export class SchemaPageComponent extends AppComponentBase implements OnInit {
         this.editSchemaDialog.hide();
     }
 
-    public updateProperties(properties: SchemaPropertiesDto) {
+    private updateProperties(properties: SchemaPropertiesDto) {
         this.schemaProperties = properties;
 
         this.notify();
     }
 
-    public updateField(field: FieldDto, newField: FieldDto) {
+    private updateField(field: FieldDto, newField: FieldDto) {
         this.schemaFields = this.schemaFields.replace(field, newField);
 
         this.notify();
diff --git a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts
index d789c5ea4..8ab986dc9 100644
--- a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts
+++ b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts
@@ -62,6 +62,11 @@ export class SchemaFormComponent {
     ) {
     }
 
+    public cancel() {
+        this.reset();
+        this.cancelled.emit();
+    }
+
     public createSchema() {
         this.createFormSubmitted = true;
 
@@ -83,17 +88,12 @@ export class SchemaFormComponent {
         }
     }
 
-    public reset() {
+    private reset() {
         this.creationError = '';
         this.createForm.reset();
         this.createFormSubmitted = false;
     }
 
-    public cancel() {
-        this.reset();
-        this.cancelled.emit();
-    }
-
     private createSchemaDto(id: string, name: string) {
         const user = this.authService.user!.token;
         const now = DateTime.now();
diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts
index 57e10d8e5..7508460a4 100644
--- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts
+++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts
@@ -73,7 +73,7 @@ export class SchemasPageComponent extends AppComponentBase implements OnDestroy,
         this.load();
     }
 
-    public load() {
+    private load() {
         this.appName()
             .switchMap(app => this.schemasService.getSchemas(app).retry(2))
             .subscribe(dtos => {
diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.ts b/src/Squidex/app/features/settings/pages/clients/client.component.ts
index 6db0b1d49..f75eb72fb 100644
--- a/src/Squidex/app/features/settings/pages/clients/client.component.ts
+++ b/src/Squidex/app/features/settings/pages/clients/client.component.ts
@@ -33,10 +33,10 @@ export class ClientComponent {
     public token: AccessTokenDto;
 
     @Output()
-    public renamed = new EventEmitter<string>();
+    public renaming = new EventEmitter<string>();
 
     @Output()
-    public revoked = new EventEmitter();
+    public revoking = new EventEmitter();
 
     @Input()
     public client: AppClientDto;
@@ -97,7 +97,7 @@ export class ClientComponent {
             const newName = this.renameForm.get('name').value;
 
             if (newName !== this.clientName) {
-                this.renamed.emit(newName);
+                this.renaming.emit(newName);
             }
         } finally {
             this.isRenaming = false;
diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
index b77746430..7288beab2 100644
--- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
+++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
@@ -18,7 +18,9 @@
             </div>
 
             <div *ngFor="let client of appClients">
-                <sqx-client [client]="client" [appName]="appName() | async" (renamed)="renameClient(client, $event)" (revoked)="revokeClient(client)"></sqx-client>
+                <sqx-client [client]="client" [appName]="appName() | async" 
+                    (renaming)="renameClient(client, $event)" 
+                    (revoking)="revokeClient(client)"></sqx-client>
             </div>
 
             <div class="table-items-footer">
diff --git a/src/Squidex/app/shared/components/app-form.component.ts b/src/Squidex/app/shared/components/app-form.component.ts
index 4466f73bb..0d552b680 100644
--- a/src/Squidex/app/shared/components/app-form.component.ts
+++ b/src/Squidex/app/shared/components/app-form.component.ts
@@ -50,6 +50,11 @@ export class AppFormComponent {
     ) {
     }
 
+    public cancel() {
+        this.reset();
+        this.cancelled.emit();
+    }
+
     public createApp() {
         this.createFormSubmitted = true;
 
@@ -74,9 +79,4 @@ export class AppFormComponent {
         this.createForm.enable();
         this.createFormSubmitted = false;
     }
-
-    public cancel() {
-        this.reset();
-        this.cancelled.emit();
-    }
 }
\ No newline at end of file