diff --git a/src/Squidex/app/features/content/shared/array-editor.component.html b/src/Squidex/app/features/content/shared/array-editor.component.html
index c1b012aa8..e116e1f6e 100644
--- a/src/Squidex/app/features/content/shared/array-editor.component.html
+++ b/src/Squidex/app/features/content/shared/array-editor.component.html
@@ -3,7 +3,7 @@
     [cdkDropListDisabled]="false"
     [cdkDropListData]="arrayControl.controls"
     (cdkDropListDropped)="sort($event)">
-    <div *ngFor="let itemForm of arrayControl.controls; let i = index"
+    <div *ngFor="let itemForm of arrayControl.controls; let i = index; trackBy:trackByControl"
         class="table-drag item"
         cdkDrag
         cdkDragLockAxis="y">
diff --git a/src/Squidex/app/features/content/shared/array-editor.component.ts b/src/Squidex/app/features/content/shared/array-editor.component.ts
index 34c527e13..fd3b81fc3 100644
--- a/src/Squidex/app/features/content/shared/array-editor.component.ts
+++ b/src/Squidex/app/features/content/shared/array-editor.component.ts
@@ -84,4 +84,8 @@ export class ArrayEditorComponent {
             this.arrayControl.setControl(i, controls[i]);
         }
     }
+
+    public trackByControl(index: number, control: AbstractControl) {
+        return control;
+    }
 }
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/shared/array-item.component.html b/src/Squidex/app/features/content/shared/array-item.component.html
index 463f051c0..b04a064d6 100644
--- a/src/Squidex/app/features/content/shared/array-item.component.html
+++ b/src/Squidex/app/features/content/shared/array-item.component.html
@@ -43,7 +43,7 @@
     </div>
     
     <div class="card-body" [class.hidden]="isHidden">
-        <div class="form-group" *ngFor="let fieldControl of fieldControls">
+        <div class="form-group" *ngFor="let fieldControl of fieldControls; trackBy: trackByField">
             <sqx-field-editor
                 [form]="form"
                 [formContext]="formContext"
diff --git a/src/Squidex/app/features/content/shared/array-item.component.ts b/src/Squidex/app/features/content/shared/array-item.component.ts
index 8f4be9923..7d9a5d17f 100644
--- a/src/Squidex/app/features/content/shared/array-item.component.ts
+++ b/src/Squidex/app/features/content/shared/array-item.component.ts
@@ -173,4 +173,8 @@ export class ArrayItemComponent implements OnChanges, OnDestroy {
     public emitMoveBottom() {
         this.move.emit(99999);
     }
+
+    public trackByField(index: number, control: FieldControl) {
+        return control.field.name;
+    }
 }
\ No newline at end of file
diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.scss b/src/Squidex/app/features/schemas/pages/schema/field.component.scss
index 787975e13..8b2574a57 100644
--- a/src/Squidex/app/features/schemas/pages/schema/field.component.scss
+++ b/src/Squidex/app/features/schemas/pages/schema/field.component.scss
@@ -38,10 +38,6 @@ $padding: 1rem;
     }
 }
 
-.field {
-    position: relative;
-}
-
 .nested-fields {
     padding: $padding;
     padding-left: 2 * $padding;
@@ -57,7 +53,7 @@ $padding: 1rem;
     }
 
     &-add {
-        border: 1px dashed $field-line;
+        border: 2px dashed $field-line;
         position: relative;
         padding: 1rem;
     }
@@ -65,19 +61,23 @@ $padding: 1rem;
     &-line-v {
         @include absolute($padding, auto, 3 * $padding + .25rem, $padding);
         border: 0;
-        border-left: 1px dashed $field-line;
+        border-left: 2px dashed $field-line;
         width: 2px;
     }
 
     &-line-h {
         @include absolute(-2px, auto, 50%, -$padding);
         border: 0;
-        border-bottom: 1px dashed $field-line;
+        border-bottom: 2px dashed $field-line;
         width: $padding - .25rem;
     }
 }
 
 .field {
+    & {
+        position: relative;
+    }
+
     &-icon {
         margin-right: 1rem;
         color: $color-border-dark;
diff --git a/src/Squidex/app/shared/components/rich-editor.component.html b/src/Squidex/app/shared/components/rich-editor.component.html
index 9a6ea240a..dadad2095 100644
--- a/src/Squidex/app/shared/components/rich-editor.component.html
+++ b/src/Squidex/app/shared/components/rich-editor.component.html
@@ -1,5 +1,5 @@
 <div class="drop-container" (sqxDropFile)="insertFiles($event)" [onlyImages]="true">
-    <div class="editor" #editor>Loading editor...</div>
+    <div class="editor" #editor></div>
 </div>
 
 <ng-container *sqxModal="assetsDialog">
diff --git a/src/Squidex/app/shared/components/rich-editor.component.ts b/src/Squidex/app/shared/components/rich-editor.component.ts
index 928ff1bfd..14ceb4c2b 100644
--- a/src/Squidex/app/shared/components/rich-editor.component.ts
+++ b/src/Squidex/app/shared/components/rich-editor.component.ts
@@ -66,7 +66,7 @@ export class RichEditorComponent extends StatefulControlComponent<undefined, str
     public ngOnDestroy() {
         clearTimeout(this.tinyInitTimer);
 
-        if (tinymce && this.editor) {
+        if (this.tinyEditor) {
             tinymce.remove(this.editor);
         }
     }
@@ -74,7 +74,7 @@ export class RichEditorComponent extends StatefulControlComponent<undefined, str
     public ngAfterViewInit() {
         const self = this;
 
-        this.resourceLoader.loadScript('https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.9.3/tinymce.min.js').then(() => {
+        this.resourceLoader.loadScript('https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.9.4/tinymce.min.js').then(() => {
             tinymce.init(self.getEditorOptions());
         });
     }
diff --git a/src/Squidex/app/shared/state/contents.state.ts b/src/Squidex/app/shared/state/contents.state.ts
index 410d10518..38248e97e 100644
--- a/src/Squidex/app/shared/state/contents.state.ts
+++ b/src/Squidex/app/shared/state/contents.state.ts
@@ -56,7 +56,7 @@ interface Snapshot {
 }
 
 function sameContent(lhs: ContentDto, rhs?: ContentDto): boolean {
-    return lhs === rhs || (!!lhs && !!rhs && lhs.id === rhs.id && lhs.version === rhs.version);
+    return lhs === rhs || (!!lhs && !!rhs && lhs.id === rhs.id && lhs.version.eq(lhs.version));
 }
 
 export abstract class ContentsStateBase extends State<Snapshot> {