diff --git a/src/Squidex/app-config/webpack.config.js b/src/Squidex/app-config/webpack.config.js
index f755c7f79..2a80d89b8 100644
--- a/src/Squidex/app-config/webpack.config.js
+++ b/src/Squidex/app-config/webpack.config.js
@@ -125,7 +125,11 @@ module.exports = function (env) {
                 use: [{
                     loader: 'raw-loader'
                 }, {
-                    loader: 'sass-loader', options: { includePaths: [root('app', 'theme')] }
+                    loader: 'sass-loader', options: {
+                        sassOptions: {
+                            includePaths: [root('app', 'theme')]
+                        }
+                    }
                 }],
                 exclude: root('app', 'theme')
             }]
diff --git a/src/Squidex/app/app.module.ts b/src/Squidex/app/app.module.ts
index f4c512db3..bb9e56f10 100644
--- a/src/Squidex/app/app.module.ts
+++ b/src/Squidex/app/app.module.ts
@@ -55,7 +55,7 @@ export function configUIOptions() {
 }
 
 export function configTitles() {
-    return new TitlesConfig({}, undefined, 'Squidex Headless CMS');
+    return new TitlesConfig(undefined, 'Squidex Headless CMS');
 }
 
 export function configAnalyticsId() {
diff --git a/src/Squidex/app/features/administration/declarations.ts b/src/Squidex/app/features/administration/declarations.ts
index 5c8cac3a6..3f4bb103f 100644
--- a/src/Squidex/app/features/administration/declarations.ts
+++ b/src/Squidex/app/features/administration/declarations.ts
@@ -10,8 +10,10 @@ export * from './administration-area.component';
 export * from './guards/user-must-exist.guard';
 export * from './guards/unset-user.guard';
 
+export * from './pages/event-consumers/event-consumer.component';
 export * from './pages/event-consumers/event-consumers-page.component';
 export * from './pages/restore/restore-page.component';
+export * from './pages/users/user.component';
 export * from './pages/users/user-page.component';
 export * from './pages/users/users-page.component';
 
diff --git a/src/Squidex/app/features/administration/module.ts b/src/Squidex/app/features/administration/module.ts
index b130cb62f..afd698e0a 100644
--- a/src/Squidex/app/features/administration/module.ts
+++ b/src/Squidex/app/features/administration/module.ts
@@ -15,11 +15,13 @@ import {
 
 import {
     AdministrationAreaComponent,
+    EventConsumerComponent,
     EventConsumersPageComponent,
     EventConsumersService,
     EventConsumersState,
     RestorePageComponent,
     UnsetUserGuard,
+    UserComponent,
     UserMustExistGuard,
     UserPageComponent,
     UsersPageComponent,
@@ -73,8 +75,10 @@ const routes: Routes = [
     ],
     declarations: [
         AdministrationAreaComponent,
+        EventConsumerComponent,
         EventConsumersPageComponent,
         RestorePageComponent,
+        UserComponent,
         UserPageComponent,
         UsersPageComponent
     ],
diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumer.component.ts b/src/Squidex/app/features/administration/pages/event-consumers/event-consumer.component.ts
new file mode 100644
index 000000000..65a692e4e
--- /dev/null
+++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumer.component.ts
@@ -0,0 +1,66 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+// tslint:disable: component-selector
+
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
+import { EventConsumerDto, EventConsumersState } from '@app/features/administration/internal';
+
+@Component({
+    selector: '[sqxEventConsumer]',
+    template: `
+        <tr [class.faulted]="eventConsumer.error && eventConsumer.error?.length > 0">
+            <td class="auto-auto">
+                <span class="truncate">
+                    <i class="faulted-icon icon icon-bug" (click)="error.emit()" [class.hidden]="!eventConsumer.error || eventConsumer.error?.length === 0"></i>
+
+                    {{eventConsumer.name}}
+                </span>
+            </td>
+            <td class="cell-auto-right">
+                <span>{{eventConsumer.position}}</span>
+            </td>
+            <td class="cell-actions-lg">
+                <button type="button" class="btn btn-text" (click)="reset()" *ngIf="eventConsumer.canReset" title="Reset Event Consumer">
+                    <i class="icon icon-reset"></i>
+                </button>
+                <button type="button" class="btn btn-text" (click)="start()" *ngIf="eventConsumer.canStart" title="Start Event Consumer">
+                    <i class="icon icon-play"></i>
+                </button>
+                <button type="button" class="btn btn-text" (click)="stop()" *ngIf="eventConsumer.canStop" title="Stop Event Consumer">
+                    <i class="icon icon-pause"></i>
+                </button>
+            </td>
+        </tr>
+        <tr class="spacer"></tr>`,
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class EventConsumerComponent {
+    @Output()
+    public error = new EventEmitter();
+
+    @Input('sqxEventConsumer')
+    public eventConsumer: EventConsumerDto;
+
+    constructor(
+        public readonly eventConsumersState: EventConsumersState
+    ) {
+    }
+
+    public start() {
+        this.eventConsumersState.start(this.eventConsumer);
+    }
+
+    public stop() {
+        this.eventConsumersState.stop(this.eventConsumer);
+    }
+
+    public reset() {
+        this.eventConsumersState.reset(this.eventConsumer);
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html
index 2d5008929..f690b1919 100644
--- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html
+++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html
@@ -29,31 +29,8 @@
                 </tr>
             </thead>
 
-            <tbody *ngFor="let eventConsumer of eventConsumersState.eventConsumers | async; trackBy: trackByEventConsumer">
-                <tr [class.faulted]="eventConsumer.error && eventConsumer.error.length > 0">
-                    <td class="auto-auto">
-                        <span class="truncate">
-                            <i class="faulted-icon icon icon-bug" (click)="showError(eventConsumer)" [class.hidden]="!eventConsumer.error || eventConsumer.error.length === 0"></i>
-
-                            {{eventConsumer.name}}
-                        </span>
-                    </td>
-                    <td class="cell-auto-right">
-                        <span>{{eventConsumer.position}}</span>
-                    </td>
-                    <td class="cell-actions-lg">
-                        <button type="button" class="btn btn-text" (click)="reset(eventConsumer)" *ngIf="eventConsumer.canReset" title="Reset Event Consumer">
-                            <i class="icon icon-reset"></i>
-                        </button>
-                        <button type="button" class="btn btn-text" (click)="start(eventConsumer)" *ngIf="eventConsumer.canStart" title="Start Event Consumer">
-                            <i class="icon icon-play"></i>
-                        </button>
-                        <button type="button" class="btn btn-text" (click)="stop(eventConsumer)" *ngIf="eventConsumer.canStop" title="Stop Event Consumer">
-                            <i class="icon icon-pause"></i>
-                        </button>
-                    </td>
-                </tr>
-                <tr class="spacer"></tr>
+            <tbody *ngFor="let eventConsumer of eventConsumersState.eventConsumers | async; trackBy: trackByEventConsumer"
+                [sqxEventConsumer]="eventConsumer" (error)="showError(eventConsumer)">
             </tbody>
         </table>
     </ng-container>
diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts
index f4b0b97fd..cfee6abc9 100644
--- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts
+++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts
@@ -38,18 +38,6 @@ export class EventConsumersPageComponent extends ResourceOwner implements OnInit
         this.eventConsumersState.load(true, false);
     }
 
-    public start(eventConsumer: EventConsumerDto) {
-        this.eventConsumersState.start(eventConsumer);
-    }
-
-    public stop(eventConsumer: EventConsumerDto) {
-        this.eventConsumersState.stop(eventConsumer);
-    }
-
-    public reset(eventConsumer: EventConsumerDto) {
-        this.eventConsumersState.reset(eventConsumer);
-    }
-
     public trackByEventConsumer(index: number, es: EventConsumerDto) {
         return es.name;
     }
diff --git a/src/Squidex/app/features/administration/pages/users/user-page.component.html b/src/Squidex/app/features/administration/pages/users/user-page.component.html
index 2666ee37c..a3f1c557d 100644
--- a/src/Squidex/app/features/administration/pages/users/user-page.component.html
+++ b/src/Squidex/app/features/administration/pages/users/user-page.component.html
@@ -1,4 +1,3 @@
-<sqx-title message="User Management"></sqx-title>
 
 <form [formGroup]="userForm.form" (ngSubmit)="save()">
     <input style="display:none" type="password" name="foilautofill"/>
@@ -6,10 +5,14 @@
     <sqx-panel desiredWidth="26rem" isBlank="true" [isLazyLoaded]="false">
         <ng-container title>
             <ng-container *ngIf="usersState.selectedUser | async; else noUserTitle">
+                <sqx-title message="Edit User"></sqx-title>
+
                 Edit User
             </ng-container>
 
             <ng-template #noUserTitle>
+                <sqx-title message="New User"></sqx-title>
+
                 New User
             </ng-template>
         </ng-container>
diff --git a/src/Squidex/app/features/administration/pages/users/user.component.ts b/src/Squidex/app/features/administration/pages/users/user.component.ts
new file mode 100644
index 000000000..06d9396bb
--- /dev/null
+++ b/src/Squidex/app/features/administration/pages/users/user.component.ts
@@ -0,0 +1,55 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+// tslint:disable: component-selector
+
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
+import { UserDto, UsersState } from '@app/features/administration/internal';
+
+@Component({
+    selector: '[sqxUser]',
+    template: `
+        <tr [routerLink]="user.id" routerLinkActive="active">
+            <td class="cell-user">
+                <img class="user-picture" title="{{user.displayName}}" [attr.src]="user | sqxUserDtoPicture" />
+            </td>
+            <td class="cell-auto">
+                <span class="user-name table-cell">{{user.displayName}}</span>
+            </td>
+            <td class="cell-auto">
+                <span class="user-email table-cell">{{user.email}}</span>
+            </td>
+            <td class="cell-actions">
+                <button type="button" class="btn btn-text" (click)="lock()" sqxStopClick *ngIf="user.canLock" title="Lock User">
+                    <i class="icon icon-unlocked"></i>
+                </button>
+                <button type="button" class="btn btn-text" (click)="unlock()" sqxStopClick *ngIf="user.canUnlock" title="Unlock User">
+                    <i class="icon icon-lock"></i>
+                </button>
+            </td>
+        </tr>
+        <tr class="spacer"></tr>`,
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class UserComponent {
+    @Input('sqxUser')
+    public user: UserDto;
+
+    constructor(
+        private readonly usersState: UsersState
+    ) {
+    }
+
+    public lock() {
+        this.usersState.lock(this.user);
+    }
+
+    public unlock() {
+        this.usersState.unlock(this.user);
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.html b/src/Squidex/app/features/administration/pages/users/users-page.component.html
index 3fe383d68..eec39f31e 100644
--- a/src/Squidex/app/features/administration/pages/users/users-page.component.html
+++ b/src/Squidex/app/features/administration/pages/users/users-page.component.html
@@ -51,27 +51,8 @@
         <div class="grid-content">
             <div sqxIgnoreScrollbar>
                 <table class="table table-items table-fixed" *ngIf="usersState.users | async; let users">
-                    <tbody *ngFor="let user of users; trackBy: trackByUser">
-                        <tr [routerLink]="user.id" routerLinkActive="active">
-                            <td class="cell-user">
-                                <img class="user-picture" title="{{user.name}}" [attr.src]="user | sqxUserDtoPicture" />
-                            </td>
-                            <td class="cell-auto">
-                                <span class="user-name table-cell">{{user.displayName}}</span>
-                            </td>
-                            <td class="cell-auto">
-                                <span class="user-email table-cell">{{user.email}}</span>
-                            </td>
-                            <td class="cell-actions">
-                                <button type="button" class="btn btn-text" (click)="lock(user)" sqxStopClick *ngIf="user.canLock" title="Lock User">
-                                    <i class="icon icon-unlocked"></i>
-                                </button>
-                                <button type="button" class="btn btn-text" (click)="unlock(user)" sqxStopClick *ngIf="user.canUnlock" title="Unlock User">
-                                    <i class="icon icon-lock"></i>
-                                </button>
-                            </td>
-                        </tr>
-                        <tr class="spacer"></tr>
+                    <tbody *ngFor="let user of users; trackBy: trackByUser"
+                        [sqxUser]="user">
                     </tbody>
                 </table>
             </div>
diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.ts b/src/Squidex/app/features/administration/pages/users/users-page.component.ts
index f029712b4..9e1c698e4 100644
--- a/src/Squidex/app/features/administration/pages/users/users-page.component.ts
+++ b/src/Squidex/app/features/administration/pages/users/users-page.component.ts
@@ -43,16 +43,7 @@ export class UsersPageComponent implements OnInit {
         this.usersState.goNext();
     }
 
-    public lock(user: UserDto) {
-        this.usersState.lock(user);
-    }
-
-    public unlock(user: UserDto) {
-        this.usersState.unlock(user);
-    }
-
     public trackByUser(index: number, user: UserDto) {
         return user.id;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/administration/services/event-consumers.service.ts b/src/Squidex/app/features/administration/services/event-consumers.service.ts
index 2aa592765..5fa97ebfb 100644
--- a/src/Squidex/app/features/administration/services/event-consumers.service.ts
+++ b/src/Squidex/app/features/administration/services/event-consumers.service.ts
@@ -33,7 +33,7 @@ export class EventConsumerDto {
 
     public readonly canStop: boolean;
     public readonly canStart: boolean;
-    public readonly canRestart: boolean;
+    public readonly canReset: boolean;
 
     constructor(links: ResourceLinks,
         public readonly name: string,
@@ -46,7 +46,7 @@ export class EventConsumerDto {
 
         this.canStop = hasAnyLink(links, 'stop');
         this.canStart = hasAnyLink(links, 'start');
-        this.canRestart = hasAnyLink(links, 'canReset');
+        this.canReset = hasAnyLink(links, 'reset');
     }
 }
 
diff --git a/src/Squidex/app/features/api/api-area.component.html b/src/Squidex/app/features/api/api-area.component.html
index 8d6b3ee9f..7b996667c 100644
--- a/src/Squidex/app/features/api/api-area.component.html
+++ b/src/Squidex/app/features/api/api-area.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Settings" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="API"></sqx-title>
 
 <sqx-panel theme="dark" desiredWidth="12rem">
     <ng-container title>
diff --git a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.html b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.html
index 53fcce4f3..c9515962e 100644
--- a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.html
+++ b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | API | GraphQL" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="GraphQL"></sqx-title>
 
 <sqx-panel desiredWidth="*" minWidth="50rem" isFullSize="true">
    <div inner #graphiQLContainer></div>
diff --git a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts
index 3d32114d0..510f0d1bf 100644
--- a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts
+++ b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts
@@ -26,7 +26,7 @@ export class GraphQLPageComponent implements AfterViewInit {
     public graphiQLContainer: ElementRef;
 
     constructor(
-        public readonly appsState: AppsState,
+        private readonly appsState: AppsState,
         private readonly graphQlService: GraphQlService
     ) {
     }
@@ -45,5 +45,4 @@ export class GraphQLPageComponent implements AfterViewInit {
     private request(params: any) {
         return this.graphQlService.query(this.appsState.appName, params).pipe(catchError(response => of(response.error))).toPromise();
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/apps/pages/news-dialog.component.ts b/src/Squidex/app/features/apps/pages/news-dialog.component.ts
index 1871e0594..b7dcd9889 100644
--- a/src/Squidex/app/features/apps/pages/news-dialog.component.ts
+++ b/src/Squidex/app/features/apps/pages/news-dialog.component.ts
@@ -15,12 +15,12 @@ import { FeatureDto } from '@app/shared';
     templateUrl: './news-dialog.component.html'
 })
 export class NewsDialogComponent {
-    @Input()
-    public features: FeatureDto[];
-
     @Output()
     public close = new EventEmitter();
 
+    @Input()
+    public features: FeatureDto[];
+
     public emitClose() {
         this.close.emit();
     }
diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.html b/src/Squidex/app/features/assets/pages/assets-page.component.html
index b946bf314..82a1b2527 100644
--- a/src/Squidex/app/features/assets/pages/assets-page.component.html
+++ b/src/Squidex/app/features/assets/pages/assets-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Assets" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Assets"></sqx-title>
 
 <sqx-panel desiredWidth="*" minWidth="50rem" showSidebar="true">
     <ng-container title>
diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.ts b/src/Squidex/app/features/assets/pages/assets-page.component.ts
index b464fab13..9a5138018 100644
--- a/src/Squidex/app/features/assets/pages/assets-page.component.ts
+++ b/src/Squidex/app/features/assets/pages/assets-page.component.ts
@@ -9,7 +9,6 @@ import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
 
 import {
-    AppsState,
     AssetsState,
     LocalStoreService,
     Queries,
@@ -31,7 +30,6 @@ export class AssetsPageComponent extends ResourceOwner implements OnInit {
     public isListView: boolean;
 
     constructor(
-        public readonly appsState: AppsState,
         public readonly assetsState: AssetsState,
         private readonly localStore: LocalStoreService,
         private readonly uiState: UIState
@@ -74,5 +72,4 @@ export class AssetsPageComponent extends ResourceOwner implements OnInit {
 
         this.localStore.setBoolean('squidex.assets.list-view', isListView);
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/declarations.ts b/src/Squidex/app/features/content/declarations.ts
index 0513a17f8..e6ac799a9 100644
--- a/src/Squidex/app/features/content/declarations.ts
+++ b/src/Squidex/app/features/content/declarations.ts
@@ -17,7 +17,7 @@ export * from './pages/schemas/schemas-page.component';
 export * from './shared/array-editor.component';
 export * from './shared/array-item.component';
 export * from './shared/assets-editor.component';
-export * from './shared/content-item.component';
+export * from './shared/content.component';
 export * from './shared/content-status.component';
 export * from './shared/content-value.component';
 export * from './shared/content-value-editor.component';
diff --git a/src/Squidex/app/features/content/module.ts b/src/Squidex/app/features/content/module.ts
index a6d036c56..e22b6b3c3 100644
--- a/src/Squidex/app/features/content/module.ts
+++ b/src/Squidex/app/features/content/module.ts
@@ -25,9 +25,9 @@ import {
     ArrayItemComponent,
     AssetsEditorComponent,
     CommentsPageComponent,
+    ContentComponent,
     ContentFieldComponent,
     ContentHistoryPageComponent,
-    ContentItemComponent,
     ContentPageComponent,
     ContentsFiltersPageComponent,
     ContentsPageComponent,
@@ -112,7 +112,7 @@ const routes: Routes = [
         CommentsPageComponent,
         ContentFieldComponent,
         ContentHistoryPageComponent,
-        ContentItemComponent,
+        ContentComponent,
         ContentPageComponent,
         ContentsFiltersPageComponent,
         ContentsPageComponent,
diff --git a/src/Squidex/app/features/content/pages/comments/comments-page.component.ts b/src/Squidex/app/features/content/pages/comments/comments-page.component.ts
index 39903bf98..58ff057f2 100644
--- a/src/Squidex/app/features/content/pages/comments/comments-page.component.ts
+++ b/src/Squidex/app/features/content/pages/comments/comments-page.component.ts
@@ -26,5 +26,4 @@ export class CommentsPageComponent implements OnInit {
     public ngOnInit() {
         this.commentsId = allParams(this.route)['contentId'];
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.ts b/src/Squidex/app/features/content/pages/content/content-field.component.ts
index 137522cf2..8355376dc 100644
--- a/src/Squidex/app/features/content/pages/content/content-field.component.ts
+++ b/src/Squidex/app/features/content/pages/content/content-field.component.ts
@@ -30,6 +30,9 @@ import {
     templateUrl: './content-field.component.html'
 })
 export class ContentFieldComponent implements DoCheck, OnChanges {
+    @Output()
+    public languageChange = new EventEmitter<AppLanguageDto>();
+
     @Input()
     public form: EditContentForm;
 
@@ -54,9 +57,6 @@ export class ContentFieldComponent implements DoCheck, OnChanges {
     @Input()
     public languages: AppLanguageDto[];
 
-    @Output()
-    public languageChange = new EventEmitter<AppLanguageDto>();
-
     public selectedFormControl: AbstractControl;
     public selectedFormControlCompare?: AbstractControl;
 
@@ -195,5 +195,4 @@ export class ContentFieldComponent implements DoCheck, OnChanges {
     private configKey() {
         return `squidex.schemas.${this.schema.id}.fields.${this.field.fieldId}.show-all`;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.html b/src/Squidex/app/features/content/pages/content/content-page.component.html
index 81a5d4e06..969dddf9e 100644
--- a/src/Squidex/app/features/content/pages/content/content-page.component.html
+++ b/src/Squidex/app/features/content/pages/content/content-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | {schema} | Content" parameter1="app" parameter2="schema" [value1]="appsState.appDisplayName" [value2]="schema.displayName"></sqx-title>
+<sqx-title [message]="schema.displayName"></sqx-title>
 
 <form [formGroup]="contentForm.form" (ngSubmit)="saveAndPublish()">
     <sqx-panel desiredWidth="*" minWidth="60rem" [showSidebar]="content">
@@ -7,11 +7,15 @@
                 <i class="icon-angle-left"></i>
             </a>
 
-            <ng-container *ngIf="!content else notNewTitle">
-                New Content
+            <ng-container *ngIf="content else noContentTitle">
+                <sqx-title message="Edit Content"></sqx-title>
+
+                Edit Content
             </ng-container>
-            <ng-template #notNewTitle>
-                Content
+            <ng-template #noContentTitle>
+                <sqx-title message="New Content"></sqx-title>
+
+                New Content
             </ng-template>
         </ng-container>
 
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 945217d5b..9234a177b 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
@@ -15,7 +15,6 @@ import { ContentVersionSelected } from './../messages';
 import {
     ApiUrlConfig,
     AppLanguageDto,
-    AppsState,
     AuthService,
     AutoSaveKey,
     AutoSaveService,
@@ -70,7 +69,6 @@ export class ContentPageComponent extends ResourceOwner implements CanComponentD
     public dueTimeSelector: DueTimeSelectorComponent;
 
     constructor(apiUrl: ApiUrlConfig, authService: AuthService,
-        public readonly appsState: AppsState,
         public readonly contentsState: ContentsState,
         private readonly autoSaveService: AutoSaveService,
         private readonly dialogs: DialogService,
@@ -100,11 +98,9 @@ export class ContentPageComponent extends ResourceOwner implements CanComponentD
         this.own(
             this.schemasState.selectedSchema
                 .subscribe(schema => {
-                    if (schema) {
-                        this.schema = schema!;
+                    this.schema = schema;
 
-                        this.contentForm = new EditContentForm(this.languages, this.schema);
-                    }
+                    this.contentForm = new EditContentForm(this.languages, this.schema);
                 }));
 
         this.own(
diff --git a/src/Squidex/app/features/content/pages/content/field-languages.component.ts b/src/Squidex/app/features/content/pages/content/field-languages.component.ts
index 43ea07aec..22405ace2 100644
--- a/src/Squidex/app/features/content/pages/content/field-languages.component.ts
+++ b/src/Squidex/app/features/content/pages/content/field-languages.component.ts
@@ -32,6 +32,12 @@ import { AppLanguageDto, RootFieldDto } from '@app/shared';
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FieldLanguagesComponent {
+    @Output()
+    public languageChange = new EventEmitter<AppLanguageDto>();
+
+    @Output()
+    public showAllControlsChange = new EventEmitter<boolean>();
+
     @Input()
     public field: RootFieldDto;
 
@@ -43,10 +49,4 @@ export class FieldLanguagesComponent {
 
     @Input()
     public languages: AppLanguageDto[];
-
-    @Output()
-    public languageChange = new EventEmitter<AppLanguageDto>();
-
-    @Output()
-    public showAllControlsChange = new EventEmitter<boolean>();
 }
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.ts b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.ts
index 82e4969bb..7a5afb66c 100644
--- a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.ts
+++ b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.ts
@@ -37,9 +37,7 @@ export class ContentsFiltersPageComponent extends ResourceOwner implements OnIni
         this.own(
             this.schemasState.selectedSchema
                 .subscribe(schema => {
-                    if (schema) {
-                        this.schemaQueries = new Queries(this.uiState, `schemas.${schema.name}`);
-                    }
+                    this.schemaQueries = new Queries(this.uiState, `schemas.${schema.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 5283e4160..313bb0044 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
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | {schema} | Contents" parameter1="app" parameter2="schema" [value1]="appsState.appDisplayName" [value2]="schema.displayName"></sqx-title>
+<sqx-title [message]="schema.displayName"></sqx-title>
 
 <sqx-panel desiredWidth="*" minWidth="50rem" contentClass="grid" showSidebar="true">
     <ng-container title>
@@ -91,21 +91,18 @@
         <div class="grid-content" [sqxSyncScrolling]="header">
             <div class="table-container" sqxIgnoreScrollbar>
                 <table class="table table-items table-fixed" [style.minWidth]="minWidth">
-                    <tbody *ngFor="let content of contentsState.contents | async; trackBy: trackByContent">
-                        <tr [sqxContent]="content"
-                            (delete)="delete(content)"
-                            [selected]="isItemSelected(content)"
-                            (selectedChange)="selectItem(content, $event)"
-                            (statusChange)="changeStatus(content, $event)"
-                            (clone)="clone(content)"
-                            [language]="language"
-                            [canClone]="contentsState.snapshot.canCreate"
-                            [routerLink]="[content.id]"
-                            [routerLinkActive]="'active'"
-                            [schema]="schema"
-                            [schemaFields]="schema.listFields">
-                        </tr>
-                        <tr class="spacer"></tr>
+                    <tbody *ngFor="let content of contentsState.contents | async; trackBy: trackByContent"
+                        [sqxContent]="content"
+                        (delete)="delete(content)"
+                        [selected]="isItemSelected(content)"
+                        (selectedChange)="selectItem(content, $event)"
+                        (statusChange)="changeStatus(content, $event)"
+                        (clone)="clone(content)"
+                        [link]="[content.id]"
+                        [language]="language"
+                        [canClone]="contentsState.snapshot.canCreate"
+                        [schema]="schema"
+                        [schemaFields]="schema.listFields">
                     </tbody>
                 </table>
             </div>
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 2a17a72a5..f0c496ac0 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
@@ -10,7 +10,6 @@ import { onErrorResumeNext, switchMap, tap } from 'rxjs/operators';
 
 import {
     AppLanguageDto,
-    AppsState,
     ContentDto,
     ContentsState,
     ImmutableArray,
@@ -57,7 +56,6 @@ export class ContentsPageComponent extends ResourceOwner implements OnInit {
     public dueTimeSelector: DueTimeSelectorComponent;
 
     constructor(
-        public readonly appsState: AppsState,
         public readonly contentsState: ContentsState,
         private readonly languagesState: LanguagesState,
         private readonly schemasState: SchemasState,
@@ -72,7 +70,7 @@ export class ContentsPageComponent extends ResourceOwner implements OnInit {
                 .subscribe(schema => {
                     this.resetSelection();
 
-                    this.schema = schema!;
+                    this.schema = schema;
 
                     this.minWidth = `${300 + (200 * this.schema.listFields.length)}px`;
 
@@ -239,5 +237,4 @@ export class ContentsPageComponent extends ResourceOwner implements OnInit {
             this.queryModel = queryModelFromSchema(this.schema, this.languages.values, this.contentsState.snapshot.statuses);
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html
index 9adbbd8a0..79577f9f8 100644
--- a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html
+++ b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Schemas" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Contents"></sqx-title>
 
 <sqx-panel theme="dark" desiredWidth="16rem" showSecondHeader="true">
     <ng-container title>
diff --git a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts
index 832464b46..5e437f11d 100644
--- a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts
+++ b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts
@@ -8,11 +8,7 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
 
-import {
-    AppsState,
-    SchemaCategory,
-    SchemasState
-} from '@app/shared';
+import { SchemaCategory, SchemasState } from '@app/shared';
 
 @Component({
     selector: 'sqx-schemas-page',
@@ -23,7 +19,6 @@ export class SchemasPageComponent implements OnInit {
     public schemasFilter = new FormControl();
 
     constructor(
-        public readonly appsState: AppsState,
         public readonly schemasState: SchemasState
     ) {
     }
@@ -35,5 +30,4 @@ export class SchemasPageComponent implements OnInit {
     public trackByCategory(index: number, category: SchemaCategory) {
         return category.name;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.html b/src/Squidex/app/features/content/shared/assets-editor.component.html
index e91adce6e..ac0d20d56 100644
--- a/src/Squidex/app/features/content/shared/assets-editor.component.html
+++ b/src/Squidex/app/features/content/shared/assets-editor.component.html
@@ -27,8 +27,8 @@
                     (load)="addAsset(file, $event)">
                 </sqx-asset>
                 <sqx-asset *ngFor="let asset of snapshot.assets; trackBy: trackByAsset" [asset]="asset" [isCompact]="isCompact" removeMode="true"
-                    (update)="notifyOthers($event)"
-                    (remove)="removeLoadedAsset($event)">
+                    (update)="notifyOthers(asset)"
+                    (remove)="removeLoadedAsset(asset)">
                 </sqx-asset>
             </div>
         </ng-container>
@@ -48,8 +48,8 @@
                         <sqx-asset [asset]="asset" removeMode="true" 
                             [isListView]="true"
                             [isCompact]="isCompact"
-                            (update)="notifyOthers($event)"
-                            (remove)="removeLoadedAsset($event)">
+                            (update)="notifyOthers(asset)"
+                            (remove)="removeLoadedAsset(asset)">
                         </sqx-asset>
                     </div>
                 </div>
diff --git a/src/Squidex/app/features/content/shared/content-item.component.html b/src/Squidex/app/features/content/shared/content-item.component.html
deleted file mode 100644
index f5ed992d7..000000000
--- a/src/Squidex/app/features/content/shared/content-item.component.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<td class="cell-select" sqxStopClick>
-    <ng-container *ngIf="!isReference; else referenceTemplate">
-        <input type="checkbox" class="form-check"
-            [disabled]="!selectable"
-            [ngModel]="selected || !selectable" 
-            (ngModelChange)="selectedChange.emit($event)" />
-    </ng-container>
-    
-    <ng-template #referenceTemplate>
-        <i class="icon-drag2 drag-handle"></i>
-    </ng-template>
-</td>
-
-<td class="cell-actions cell-actions-left" *ngIf="!isReadOnly && !isDirty" sqxStopClick>
-    <div class="dropdown dropdown-options" *ngIf="content">
-        <button type="button" class="btn btn-text-secondary" (click)="dropdown.toggle()" [class.active]="dropdown.isOpen | async" #buttonOptions>
-            <i class="icon-dots"></i>
-        </button>
-
-        <ng-container *sqxModal="dropdown;closeAlways:true">
-            <div class="dropdown-menu" [sqxAnchoredTo]="buttonOptions" position="bottom-left" @fade>
-                <a class="dropdown-item" *ngFor="let info of content.statusUpdates" (click)="emitChangeStatus(info.status)">
-                    Change to <i class="icon-circle icon-sm" [style.color]="info.color"></i> {{info.status}}
-                </a>
-                <a class="dropdown-item" (click)="emitClone(); dropdown.hide()" *ngIf="canClone">
-                    Clone
-                </a>
-                
-                <div class="dropdown-divider"></div>
-    
-                <a class="dropdown-item dropdown-item-delete"
-                    (sqxConfirmClick)="emitDelete()"
-                    confirmTitle="Delete content" 
-                    confirmText="Do you really want to delete the content?">
-                    Delete
-                </a>
-            </div>
-        </ng-container>
-    </div>
-</td>
-
-<ng-container *ngIf="isDirty">
-    <td class="cell-actions" >
-        <button type="button" class="btn btn-text-secondary btn-cancel" (click)="cancel()" sqxStopClick>
-            <i class="icon-close"></i>
-        </button>
-    </td>
-
-    <td class="cell-user" >
-        <button type="button" class="btn btn-success" (click)="save()" sqxStopClick>
-            <i class="icon-checkmark"></i>
-        </button>
-    </td>
-</ng-container>
-
-<td class="cell-user" *ngIf="!isCompact && !isDirty" [sqxStopClick]="isDirty">
-    <img class="user-picture" title="{{content.lastModifiedBy | sqxUserNameRef}}" [attr.src]="content.lastModifiedBy | sqxUserPictureRef" />
-</td>
-
-<td class="cell-auto cell-content" *ngFor="let field of schemaFields; let i = index; trackBy: trackByFieldFn" [sqxStopClick]="isDirty || (field.isInlineEditable && patchAllowed)">
-    <ng-container *ngIf="field.isInlineEditable && patchAllowed; else displayTemplate">
-        <sqx-content-value-editor [form]="patchForm.form" [field]="field"></sqx-content-value-editor>
-    </ng-container>
-
-    <ng-template #displayTemplate>
-        <sqx-content-value [value]="values[i]"></sqx-content-value>
-    </ng-template>
-</td>
-
-<td class="cell-time" *ngIf="!isCompact" [sqxStopClick]="isDirty">
-    <sqx-content-status 
-        [status]="content.status"
-        [statusColor]="content.statusColor"
-        [scheduledTo]="content.scheduleJob?.status"
-        [scheduledAt]="content.scheduleJob?.dueTime"
-        [isPending]="content.isPending">
-    </sqx-content-status>
-    
-    <small class="item-modified">{{content.lastModified | sqxFromNow}}</small>
-</td>
-
-<td class="cell-actions" *ngIf="isReference" [sqxStopClick]="isDirty">
-    <div class="reference-edit">
-        <button type="button" class="btn btn-text-secondary">
-            <i class="icon-dots"></i>
-        </button>
-
-        <div class="reference-menu">
-            <a class="btn btn-text-secondary" [routerLink]="['../..', schema.name, content.id]">
-                <i class="icon-pencil"></i>
-            </a>
-
-            <button type="button" class="btn btn-text-secondary" (click)="emitDelete()">
-                <i class="icon-close"></i>
-            </button>
-        </div>
-    </div>
-</td>
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/shared/content-status.component.ts b/src/Squidex/app/features/content/shared/content-status.component.ts
index 37852c2c4..1c70a3559 100644
--- a/src/Squidex/app/features/content/shared/content-status.component.ts
+++ b/src/Squidex/app/features/content/shared/content-status.component.ts
@@ -49,5 +49,4 @@ export class ContentStatusComponent {
             return this.status;
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/shared/content-value.component.ts b/src/Squidex/app/features/content/shared/content-value.component.ts
index d7870c8c7..c245376aa 100644
--- a/src/Squidex/app/features/content/shared/content-value.component.ts
+++ b/src/Squidex/app/features/content/shared/content-value.component.ts
@@ -17,8 +17,7 @@ import { HtmlValue, Types } from '@app/shared';
         </ng-container>
         <ng-template #html>
             <span class="truncate" [innerHTML]="value.html"></span>
-        </ng-template>
-    `,
+        </ng-template>`,
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ContentValueComponent {
diff --git a/src/Squidex/app/features/content/shared/content.component.html b/src/Squidex/app/features/content/shared/content.component.html
new file mode 100644
index 000000000..a43854b26
--- /dev/null
+++ b/src/Squidex/app/features/content/shared/content.component.html
@@ -0,0 +1,101 @@
+<tr [routerLink]="link" routerLinkActive="active">
+    <td class="cell-select" sqxStopClick>
+        <ng-container *ngIf="!isReference; else referenceTemplate">
+            <input type="checkbox" class="form-check"
+                [disabled]="!selectable"
+                [ngModel]="selected || !selectable" 
+                (ngModelChange)="selectedChange.emit($event)" />
+        </ng-container>
+        
+        <ng-template #referenceTemplate>
+            <i class="icon-drag2 drag-handle"></i>
+        </ng-template>
+    </td>
+    
+    <td class="cell-actions cell-actions-left" *ngIf="!isReadOnly && !isDirty" sqxStopClick>
+        <div class="dropdown dropdown-options" *ngIf="content">
+            <button type="button" class="btn btn-text-secondary" (click)="dropdown.toggle()" [class.active]="dropdown.isOpen | async" #buttonOptions>
+                <i class="icon-dots"></i>
+            </button>
+    
+            <ng-container *sqxModal="dropdown;closeAlways:true">
+                <div class="dropdown-menu" [sqxAnchoredTo]="buttonOptions" position="bottom-left" @fade>
+                    <a class="dropdown-item" *ngFor="let info of content.statusUpdates" (click)="emitChangeStatus(info.status)">
+                        Change to <i class="icon-circle icon-sm" [style.color]="info.color"></i> {{info.status}}
+                    </a>
+                    <a class="dropdown-item" (click)="emitClone(); dropdown.hide()" *ngIf="canClone">
+                        Clone
+                    </a>
+                    
+                    <div class="dropdown-divider"></div>
+        
+                    <a class="dropdown-item dropdown-item-delete"
+                        (sqxConfirmClick)="emitDelete()"
+                        confirmTitle="Delete content" 
+                        confirmText="Do you really want to delete the content?">
+                        Delete
+                    </a>
+                </div>
+            </ng-container>
+        </div>
+    </td>
+    
+    <ng-container *ngIf="isDirty">
+        <td class="cell-actions" >
+            <button type="button" class="btn btn-text-secondary btn-cancel" (click)="cancel()" sqxStopClick>
+                <i class="icon-close"></i>
+            </button>
+        </td>
+    
+        <td class="cell-user" >
+            <button type="button" class="btn btn-success" (click)="save()" sqxStopClick>
+                <i class="icon-checkmark"></i>
+            </button>
+        </td>
+    </ng-container>
+    
+    <td class="cell-user" *ngIf="!isCompact && !isDirty" [sqxStopClick]="isDirty">
+        <img class="user-picture" title="{{content.lastModifiedBy | sqxUserNameRef}}" [attr.src]="content.lastModifiedBy | sqxUserPictureRef" />
+    </td>
+    
+    <td class="cell-auto cell-content" *ngFor="let field of schemaFields; let i = index; trackBy: trackByFieldFn" [sqxStopClick]="isDirty || (field.isInlineEditable && patchAllowed)">
+        <ng-container *ngIf="field.isInlineEditable && patchAllowed; else displayTemplate">
+            <sqx-content-value-editor [form]="patchForm.form" [field]="field"></sqx-content-value-editor>
+        </ng-container>
+    
+        <ng-template #displayTemplate>
+            <sqx-content-value [value]="values[i]"></sqx-content-value>
+        </ng-template>
+    </td>
+    
+    <td class="cell-time" *ngIf="!isCompact" [sqxStopClick]="isDirty">
+        <sqx-content-status 
+            [status]="content.status"
+            [statusColor]="content.statusColor"
+            [scheduledTo]="content.scheduleJob?.status"
+            [scheduledAt]="content.scheduleJob?.dueTime"
+            [isPending]="content.isPending">
+        </sqx-content-status>
+        
+        <small class="item-modified">{{content.lastModified | sqxFromNow}}</small>
+    </td>
+    
+    <td class="cell-actions" *ngIf="isReference" [sqxStopClick]="isDirty">
+        <div class="reference-edit">
+            <button type="button" class="btn btn-text-secondary">
+                <i class="icon-dots"></i>
+            </button>
+    
+            <div class="reference-menu">
+                <a class="btn btn-text-secondary" [routerLink]="['../..', schema.name, content.id]">
+                    <i class="icon-pencil"></i>
+                </a>
+    
+                <button type="button" class="btn btn-text-secondary" (click)="emitDelete()">
+                    <i class="icon-close"></i>
+                </button>
+            </div>
+        </div>
+    </td>
+</tr>
+<tr class="spacer"></tr>
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/shared/content-item.component.scss b/src/Squidex/app/features/content/shared/content.component.scss
similarity index 100%
rename from src/Squidex/app/features/content/shared/content-item.component.scss
rename to src/Squidex/app/features/content/shared/content.component.scss
diff --git a/src/Squidex/app/features/content/shared/content-item.component.ts b/src/Squidex/app/features/content/shared/content.component.ts
similarity index 95%
rename from src/Squidex/app/features/content/shared/content-item.component.ts
rename to src/Squidex/app/features/content/shared/content.component.ts
index f5f195645..dc42ed5ad 100644
--- a/src/Squidex/app/features/content/shared/content-item.component.ts
+++ b/src/Squidex/app/features/content/shared/content.component.ts
@@ -24,14 +24,14 @@ import {
 
 @Component({
     selector: '[sqxContent]',
-    styleUrls: ['./content-item.component.scss'],
-    templateUrl: './content-item.component.html',
+    styleUrls: ['./content.component.scss'],
+    templateUrl: './content.component.html',
     animations: [
         fadeAnimation
     ],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class ContentItemComponent implements OnChanges {
+export class ContentComponent implements OnChanges {
     @Output()
     public clone = new EventEmitter();
 
@@ -71,6 +71,9 @@ export class ContentItemComponent implements OnChanges {
     @Input()
     public isCompact = false;
 
+    @Input()
+    public link: any = null;
+
     @Input('sqxContent')
     public content: ContentDto;
 
@@ -170,5 +173,4 @@ export class ContentItemComponent implements OnChanges {
     public trackByField(field: FieldDto) {
         return field.fieldId + this.schema.id;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.html b/src/Squidex/app/features/content/shared/contents-selector.component.html
index 50b3a6fcf..c6e2958fe 100644
--- a/src/Squidex/app/features/content/shared/contents-selector.component.html
+++ b/src/Squidex/app/features/content/shared/contents-selector.component.html
@@ -62,16 +62,15 @@
         <div class="grid-content" [sqxSyncScrolling]="header">
             <div class="table-container" sqxIgnoreScrollbar>
                 <table class="table table-items table-fixed" [style.minWidth]="minWidth" *ngIf="contentsState.contents | async; let contents">
-                    <tbody *ngFor="let content of contents; trackBy: trackByContent">
-                        <tr [sqxContent]="content"
-                            [selectable]="!isItemAlreadySelected(content)"
-                            [selected]="isItemSelected(content)"
-                            (selectedChange)="selectContent(content)"
-                            [language]="language"
-                            [schema]="schema"
-                            [schemaFields]="schema.referenceFields"
-                            isReadOnly="true"></tr>
-                        <tr class="spacer"></tr>
+                    <tbody *ngFor="let content of contents; trackBy: trackByContent"
+                        [sqxContent]="content"
+                        [selectable]="!isItemAlreadySelected(content)"
+                        [selected]="isItemSelected(content)"
+                        (selectedChange)="selectContent(content)"
+                        [language]="language"
+                        [schema]="schema"
+                        [schemaFields]="schema.referenceFields"
+                        isReadOnly="true">
                     </tbody>
                 </table>
             </div>
diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.ts b/src/Squidex/app/features/content/shared/contents-selector.component.ts
index b0a631fd9..02a97c5f9 100644
--- a/src/Squidex/app/features/content/shared/contents-selector.component.ts
+++ b/src/Squidex/app/features/content/shared/contents-selector.component.ts
@@ -27,6 +27,9 @@ import {
     ]
 })
 export class ContentsSelectorComponent extends ResourceOwner implements OnInit {
+    @Output()
+    public select = new EventEmitter<ContentDto[]>();
+
     @Input()
     public language: LanguageDto;
 
@@ -42,9 +45,6 @@ export class ContentsSelectorComponent extends ResourceOwner implements OnInit {
     @Input()
     public schema: SchemaDetailsDto;
 
-    @Output()
-    public select = new EventEmitter<ContentDto[]>();
-
     public queryModel: QueryModel;
 
     public selectedItems:  { [id: string]: ContentDto; } = {};
@@ -142,5 +142,4 @@ export class ContentsSelectorComponent extends ResourceOwner implements OnInit {
     public trackByContent(content: ContentDto): string {
         return content.id;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/shared/due-time-selector.component.ts b/src/Squidex/app/features/content/shared/due-time-selector.component.ts
index 7bef86cb4..ce8a69e5c 100644
--- a/src/Squidex/app/features/content/shared/due-time-selector.component.ts
+++ b/src/Squidex/app/features/content/shared/due-time-selector.component.ts
@@ -48,5 +48,4 @@ export class DueTimeSelectorComponent {
         this.dueTimeFunction = null!;
         this.dueTime = null;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/shared/references-editor.component.html b/src/Squidex/app/features/content/shared/references-editor.component.html
index 0d2ed7797..415f62d02 100644
--- a/src/Squidex/app/features/content/shared/references-editor.component.html
+++ b/src/Squidex/app/features/content/shared/references-editor.component.html
@@ -9,16 +9,15 @@
         <table class="table table-items table-fixed" [class.disabled]="snapshot.isDisabled" *ngIf="schema && snapshot.contentItems && snapshot.contentItems.length > 0"
             [sqxSortModel]="snapshot.contentItems.mutableValues" 
             (sqxSort)="sort($event)">
-            <tbody *ngFor="let content of snapshot.contentItems; trackBy: trackByContent">
-                <tr [sqxContent]="content"
-                    [language]="language"
-                    [isReadOnly]="true"
-                    [isReference]="true"
-                    [isCompact]="isCompact"
-                    [schema]="schema"
-                    [schemaFields]="schema.referenceFields"
-                    (delete)="remove(content)"></tr>
-                <tr class="spacer"></tr>
+            <tbody *ngFor="let content of snapshot.contentItems; trackBy: trackByContent"
+                [sqxContent]="content"
+                [language]="language"
+                [isReadOnly]="true"
+                [isReference]="true"
+                [isCompact]="isCompact"
+                [schema]="schema"
+                [schemaFields]="schema.referenceFields"
+                (delete)="remove(content)">
             </tbody>
         </table>
     </ng-container>
diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html
index f11416433..08a2eb56d 100644
--- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html
+++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html
@@ -1,6 +1,6 @@
-<ng-container *ngIf="app | async; let app">
-    <sqx-title message="{app} | Dashboard" parameter1="app" [value1]="app.displayName"></sqx-title>
+<sqx-title message="Dashboard"></sqx-title>
 
+<ng-container *ngIf="appsState.selectedApp | async; let app">
     <div class="dashboard" @fade>
         <div class="dashboard-inner">
             <div>
diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts
index 59f67b101..fe2a97291 100644
--- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts
+++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts
@@ -51,8 +51,6 @@ export class DashboardPageComponent extends ResourceOwner implements OnInit {
 
     public isPerformanceStacked = false;
 
-    public app = this.appsState.selectedValidApp;
-
     public chartOptions = {
         responsive: true,
         scales: {
@@ -106,7 +104,7 @@ export class DashboardPageComponent extends ResourceOwner implements OnInit {
 
     public ngOnInit() {
         this.own(
-            this.app.pipe(
+            this.appsState.selectedApp.pipe(
                     switchMap(app => this.usagesService.getTodayStorage(app.name)))
                 .subscribe(dto => {
                     this.assetsCurrent = dto.size;
@@ -114,7 +112,7 @@ export class DashboardPageComponent extends ResourceOwner implements OnInit {
                 }));
 
         this.own(
-            this.app.pipe(
+            this.appsState.selectedApp.pipe(
                     switchMap(app => this.usagesService.getMonthCalls(app.name)))
                 .subscribe(dto => {
                     this.callsCurrent = dto.count;
@@ -122,14 +120,14 @@ export class DashboardPageComponent extends ResourceOwner implements OnInit {
                 }));
 
         this.own(
-            this.app.pipe(
+            this.appsState.selectedApp.pipe(
                     switchMap(app => this.historyService.getHistory(app.name, '')))
                 .subscribe(dto => {
                     this.history = dto;
                 }));
 
         this.own(
-            this.app.pipe(
+            this.appsState.selectedApp.pipe(
                     switchMap(app => this.usagesService.getStorageUsages(app.name, DateTime.today().addDays(-20), DateTime.today())))
                 .subscribe(dtos => {
                     const labels = createLabels(dtos);
@@ -166,7 +164,7 @@ export class DashboardPageComponent extends ResourceOwner implements OnInit {
                 }));
 
         this.own(
-            this.app.pipe(
+            this.appsState.selectedApp.pipe(
                     switchMap(app => this.usagesService.getCallsUsages(app.name, DateTime.today().addDays(-20), DateTime.today())))
                 .subscribe(dtos => {
                     const labels = createLabelsFromSet(dtos);
@@ -215,5 +213,4 @@ function createLabels(dtos: { date: DateTime }[]): string[] {
 
 function createLabelsFromSet(dtos: { [category: string]: { date: DateTime }[] }): string[] {
     return createLabels(dtos[Object.keys(dtos)[0]]);
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/rules/declarations.ts b/src/Squidex/app/features/rules/declarations.ts
index e8d6e49d0..c7b176948 100644
--- a/src/Squidex/app/features/rules/declarations.ts
+++ b/src/Squidex/app/features/rules/declarations.ts
@@ -12,6 +12,7 @@ export * from './pages/rules/triggers/content-changed-trigger.component';
 export * from './pages/rules/triggers/schema-changed-trigger.component';
 export * from './pages/rules/triggers/usage-trigger.component';
 
+export * from './pages/rules/rule.component';
 export * from './pages/rules/rule-element.component';
 export * from './pages/rules/rule-wizard.component';
 export * from './pages/rules/rules-page.component';
diff --git a/src/Squidex/app/features/rules/module.ts b/src/Squidex/app/features/rules/module.ts
index 78b84b860..10285cbaf 100644
--- a/src/Squidex/app/features/rules/module.ts
+++ b/src/Squidex/app/features/rules/module.ts
@@ -18,6 +18,7 @@ import {
     AssetChangedTriggerComponent,
     ContentChangedTriggerComponent,
     GenericActionComponent,
+    RuleComponent,
     RuleElementComponent,
     RuleEventBadgeClassPipe,
     RuleEventsPageComponent,
@@ -57,6 +58,7 @@ const routes: Routes = [
         AssetChangedTriggerComponent,
         ContentChangedTriggerComponent,
         GenericActionComponent,
+        RuleComponent,
         RuleElementComponent,
         RuleEventBadgeClassPipe,
         RuleEventsPageComponent,
diff --git a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html
index a53333758..fb59e4e5d 100644
--- a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html
+++ b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Rules Events" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Events"></sqx-title>
 
 <sqx-panel desiredWidth="63rem">
     <ng-container title>
diff --git a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts
index 298d0a6f3..7a91b0d22 100644
--- a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts
+++ b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts
@@ -8,7 +8,6 @@
 import { Component, OnInit } from '@angular/core';
 
 import {
-    AppsState,
     RuleEventDto,
     RuleEventsState
 } from '@app/shared';
@@ -22,7 +21,6 @@ export class RuleEventsPageComponent implements OnInit {
     public selectedEventId: string | null = null;
 
     constructor(
-        public readonly appsState: AppsState,
         public readonly ruleEventsState: RuleEventsState
     ) {
     }
@@ -58,5 +56,4 @@ export class RuleEventsPageComponent implements OnInit {
     public trackByRuleEvent(index: number, ruleEvent: RuleEventDto) {
         return ruleEvent.id;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts
index 6c47ce087..88d7562d4 100644
--- a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts
+++ b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts
@@ -27,18 +27,6 @@ export const MODE_EDIT_ACTION  = 'EditAction';
     templateUrl: './rule-wizard.component.html'
 })
 export class RuleWizardComponent implements AfterViewInit, OnInit {
-    public actionForm = new Form<FormGroup, any>(new FormGroup({}));
-    public actionType: string;
-    public action: any = {};
-
-    public triggerForm = new Form<FormGroup, any>(new FormGroup({}));
-    public triggerType: string;
-    public trigger: any = {};
-
-    public isEditable: boolean;
-
-    public step = 1;
-
     @Output()
     public complete = new EventEmitter();
 
@@ -57,6 +45,18 @@ export class RuleWizardComponent implements AfterViewInit, OnInit {
     @Input()
     public mode = MODE_WIZARD;
 
+    public actionForm = new Form<FormGroup, any>(new FormGroup({}));
+    public actionType: string;
+    public action: any = {};
+
+    public triggerForm = new Form<FormGroup, any>(new FormGroup({}));
+    public triggerType: string;
+    public trigger: any = {};
+
+    public isEditable: boolean;
+
+    public step = 1;
+
     constructor(
         private readonly rulesState: RulesState
     ) {
diff --git a/src/Squidex/app/features/rules/pages/rules/rule.component.ts b/src/Squidex/app/features/rules/pages/rules/rule.component.ts
new file mode 100644
index 000000000..f4ce4d4e3
--- /dev/null
+++ b/src/Squidex/app/features/rules/pages/rules/rule.component.ts
@@ -0,0 +1,87 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+// tslint:disable: component-selector
+
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+
+import {
+    ActionsDto,
+    RuleDto,
+    RulesState,
+    TriggersDto
+} from '@app/shared';
+
+@Component({
+    selector: '[sqxRule]',
+    template: `
+        <tr>
+            <td class="cell-separator">
+                <h3>If</h3>
+            </td>
+            <td class="cell-auto">
+                <span (click)="editTrigger.emit()">
+                    <sqx-rule-element [type]="rule.triggerType" [element]="ruleTriggers[rule.triggerType]"></sqx-rule-element>
+                </span>
+            </td>
+            <td class="cell-separator">
+                <h3>then</h3>
+            </td>
+            <td class="cell-auto">
+                <span (click)="editAction.emit()">
+                    <sqx-rule-element [type]="rule.actionType" [element]="ruleActions[rule.actionType]"></sqx-rule-element>
+                </span>
+            </td>
+            <td class="cell-actions">
+                <sqx-toggle [disabled]="!rule.canDisable && !rule.canEnable" [ngModel]="rule.isEnabled" (ngModelChange)="toggle()"></sqx-toggle>
+            </td>
+            <td class="cell-actions">
+                <button type="button" class="btn btn-text-danger"
+                    [disabled]="!rule.canDelete"
+                    (sqxConfirmClick)="delete()"
+                    confirmTitle="Delete rule"
+                    confirmText="Do you really want to delete the rule?">
+                    <i class="icon-bin2"></i>
+                </button>
+            </td>
+        </tr>
+        <tr class="spacer"></tr>`,
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class RuleComponent {
+    @Output()
+    public editTrigger = new EventEmitter();
+
+    @Output()
+    public editAction = new EventEmitter();
+
+    @Input()
+    public ruleTriggers: TriggersDto;
+
+    @Input()
+    public ruleActions: ActionsDto;
+
+    @Input('sqxRule')
+    public rule: RuleDto;
+
+    constructor(
+        private readonly rulesState: RulesState
+    ) {
+    }
+
+    public delete() {
+        this.rulesState.delete(this.rule);
+    }
+
+    public toggle() {
+        if (this.rule.isEnabled) {
+            this.rulesState.disable(this.rule);
+        } else {
+            this.rulesState.enable(this.rule);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html
index 7a346488f..f13600229 100644
--- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html
+++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Rules" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Rules"></sqx-title>
 
 <sqx-panel desiredWidth="54rem" showSidebar="true">
     <ng-container title>
@@ -32,38 +32,14 @@
             </div>
 
             <table class="table table-items table-fixed">
-                <tbody *ngFor="let rule of rules; trackBy: trackByRule">
-                    <tr>
-                        <td class="cell-separator">
-                            <h3>If</h3>
-                        </td>
-                        <td class="cell-auto">
-                            <span (click)="editTrigger(rule)">
-                                <sqx-rule-element [type]="rule.triggerType" [element]="ruleTriggers[rule.triggerType]"></sqx-rule-element>
-                            </span>
-                        </td>
-                        <td class="cell-separator">
-                            <h3>then</h3>
-                        </td>
-                        <td class="cell-auto">
-                            <span (click)="editAction(rule)">
-                                <sqx-rule-element [type]="rule.actionType" [element]="ruleActions[rule.actionType]"></sqx-rule-element>
-                            </span>
-                        </td>
-                        <td class="cell-actions">
-                            <sqx-toggle [disabled]="!rule.canDisable && !rule.canEnable" [ngModel]="rule.isEnabled" (ngModelChange)="toggle(rule)"></sqx-toggle>
-                        </td>
-                        <td class="cell-actions">
-                            <button type="button" class="btn btn-text-danger"
-                                [disabled]="!rule.canDelete"
-                                (sqxConfirmClick)="delete(rule)"
-                                confirmTitle="Delete rule" 
-                                confirmText="Do you really want to delete the rule?">
-                                <i class="icon-bin2"></i>
-                            </button>
-                        </td>
-                    </tr>
-                    <tr class="spacer"></tr>
+                <tbody *ngFor="let rule of rules; trackBy: trackByRule"
+                    [sqxRule]="rule"
+                    [ruleActions]="ruleActions"
+                    [ruleTriggers]="ruleTriggers"
+                    (delete)="delete(rule)"
+                    (editAction)="editAction(rule)"
+                    (editTrigger)="editTrigger(rule)"
+                    (toggle)="toggle(rule)">
                 </tbody>
             </table>
 
diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts
index ff75e7716..7418562e5 100644
--- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts
+++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts
@@ -9,7 +9,6 @@ import { Component, OnInit } from '@angular/core';
 
 import {
     ALL_TRIGGERS,
-    AppsState,
     DialogModel,
     RuleDto,
     RuleElementDto,
@@ -33,7 +32,6 @@ export class RulesPageComponent implements OnInit {
     public ruleTriggers = ALL_TRIGGERS;
 
     constructor(
-        public readonly appsState: AppsState,
         public readonly rulesState: RulesState,
         public readonly rulesService: RulesService,
         public readonly schemasState: SchemasState
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 d223ab8ed..9984f9935 100644
--- a/src/Squidex/app/features/schemas/pages/schema/field.component.ts
+++ b/src/Squidex/app/features/schemas/pages/schema/field.component.ts
@@ -131,5 +131,4 @@ export class FieldComponent implements OnChanges {
     public trackByField(index: number, field: NestedFieldDto) {
         return field.fieldId + this.schema.id;
     }
-}
-
+}
\ 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 c2a72eea0..a4689d3e4 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
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | {schema}" parameter1="app" [value1]="appsState.appDisplayName" parameter2="schema" [value2]="schemasState.schemaName"></sqx-title>
+<sqx-title [message]="schemasState.schemaName"></sqx-title>
 
 <sqx-panel desiredWidth="60rem" [showSidebar]="true">
     <ng-container title>
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 250aedc9d..1f5ef7fd9 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
@@ -11,7 +11,6 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import {
-    AppsState,
     DialogModel,
     fadeAnimation,
     FieldDto,
@@ -51,7 +50,6 @@ export class SchemaPageComponent extends ResourceOwner implements OnInit {
     public trackByFieldFn: Function;
 
     constructor(
-        public readonly appsState: AppsState,
         public readonly schemasState: SchemasState,
         public readonly patternsState: PatternsState,
         private readonly route: ActivatedRoute,
@@ -69,9 +67,7 @@ export class SchemaPageComponent extends ResourceOwner implements OnInit {
         this.own(
             this.schemasState.selectedSchema
                 .subscribe(schema => {
-                    if (schema) {
-                        this.schema = schema;
-                    }
+                    this.schema = schema;
                 }));
     }
 
@@ -105,5 +101,4 @@ export class SchemaPageComponent extends ResourceOwner implements OnInit {
     private back() {
         this.router.navigate(['../'], { relativeTo: this.route });
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
index 6af0c2b56..52bd7698f 100644
--- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
+++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Schemas" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Schemas"></sqx-title>
 
 <sqx-panel theme="dark" desiredWidth="30rem" showSecondHeader="true">
     <ng-container title>
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 10b07fade..a0425dacc 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
@@ -11,7 +11,6 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { map } from 'rxjs/operators';
 
 import {
-    AppsState,
     CreateCategoryForm,
     DialogModel,
     MessageBus,
@@ -37,7 +36,6 @@ export class SchemasPageComponent extends ResourceOwner implements OnInit {
     public import: any;
 
     constructor(
-        public readonly appsState: AppsState,
         public readonly schemasState: SchemasState,
         private readonly formBuilder: FormBuilder,
         private readonly messageBus: MessageBus,
@@ -98,5 +96,4 @@ export class SchemasPageComponent extends ResourceOwner implements OnInit {
     public trackByCategory(index: number, category: SchemaCategory) {
         return category.name;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/declarations.ts b/src/Squidex/app/features/settings/declarations.ts
index 32b8bfd08..367ab79ee 100644
--- a/src/Squidex/app/features/settings/declarations.ts
+++ b/src/Squidex/app/features/settings/declarations.ts
@@ -5,20 +5,27 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
+export * from './pages/backups/backup.component';
 export * from './pages/backups/backups-page.component';
-export * from './pages/backups/pipes';
+export * from './pages/clients/client-add-form.component';
 export * from './pages/clients/client.component';
 export * from './pages/clients/clients-page.component';
+export * from './pages/contributors/contributor-add-form.component';
+export * from './pages/contributors/contributor.component';
 export * from './pages/contributors/contributors-page.component';
 export * from './pages/contributors/import-contributors-dialog.component';
+export * from './pages/languages/language-add-form.component';
 export * from './pages/languages/language.component';
 export * from './pages/languages/languages-page.component';
 export * from './pages/more/more-page.component';
 export * from './pages/patterns/pattern.component';
 export * from './pages/patterns/patterns-page.component';
+export * from './pages/plans/plan.component';
 export * from './pages/plans/plans-page.component';
+export * from './pages/roles/role-add-form.component';
 export * from './pages/roles/role.component';
 export * from './pages/roles/roles-page.component';
+export * from './pages/workflows/workflow-add-form.component';
 export * from './pages/workflows/workflow-step.component';
 export * from './pages/workflows/workflow-transition.component';
 export * from './pages/workflows/workflow.component';
diff --git a/src/Squidex/app/features/settings/module.ts b/src/Squidex/app/features/settings/module.ts
index 2cb535224..1a11eea50 100644
--- a/src/Squidex/app/features/settings/module.ts
+++ b/src/Squidex/app/features/settings/module.ts
@@ -16,21 +16,28 @@ import {
 } from '@app/shared';
 
 import {
-    BackupDurationPipe,
+    BackupComponent,
     BackupsPageComponent,
+    ClientAddFormComponent,
     ClientComponent,
     ClientsPageComponent,
+    ContributorAddFormComponent,
+    ContributorComponent,
     ContributorsPageComponent,
     ImportContributorsDialogComponent,
+    LanguageAddFormComponent,
     LanguageComponent,
     LanguagesPageComponent,
     MorePageComponent,
     PatternComponent,
     PatternsPageComponent,
+    PlanComponent,
     PlansPageComponent,
+    RoleAddFormComponent,
     RoleComponent,
     RolesPageComponent,
     SettingsAreaComponent,
+    WorkflowAddFormComponent,
     WorkflowComponent,
     WorkflowsPageComponent,
     WorkflowStepComponent,
@@ -196,25 +203,32 @@ const routes: Routes = [
         RouterModule.forChild(routes)
     ],
     declarations: [
-        BackupDurationPipe,
+        BackupComponent,
         BackupsPageComponent,
+        ClientAddFormComponent,
         ClientComponent,
         ClientsPageComponent,
+        ContributorAddFormComponent,
+        ContributorComponent,
         ContributorsPageComponent,
         ImportContributorsDialogComponent,
+        LanguageAddFormComponent,
         LanguageComponent,
         LanguagesPageComponent,
         MorePageComponent,
         PatternComponent,
         PatternsPageComponent,
+        PlanComponent,
         PlansPageComponent,
+        RoleAddFormComponent,
         RoleComponent,
         RolesPageComponent,
         SettingsAreaComponent,
+        WorkflowAddFormComponent,
         WorkflowComponent,
         WorkflowsPageComponent,
-        WorkflowTransitionComponent,
-        WorkflowStepComponent
+        WorkflowStepComponent,
+        WorkflowTransitionComponent
     ]
 })
 export class SqxFeatureSettingsModule {}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/backups/backup.component.ts b/src/Squidex/app/features/settings/pages/backups/backup.component.ts
new file mode 100644
index 000000000..f99bed7ce
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/backups/backup.component.ts
@@ -0,0 +1,87 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
+import {
+    ApiUrlConfig,
+    BackupDto,
+    BackupsState,
+    Duration
+} from '@app/shared';
+
+@Component({
+    selector: 'sqx-backup',
+    template: `
+        <div class="table-items-row">
+            <div class="row">
+                <div class="col-auto" [ngSwitch]="backup.status">
+                    <sqx-status-icon size="lg" [status]="backup.status"></sqx-status-icon>
+                </div>
+                <div class="col-auto">
+                    <div>
+                        Started:
+                    </div>
+                    <div>
+                        Duration:
+                    </div>
+                </div>
+                <div class="col-3">
+                    <div>
+                        {{backup.started | sqxFromNow}}
+                    </div>
+                    <div *ngIf="backup.stopped">
+                        {{duration}}
+                    </div>
+                </div>
+                <div class="col">
+                    <div>
+                        <span title="Archived events">
+                            Events: <strong class="backup-progress">{{backup.handledEvents | sqxKNumber}}</strong>
+                        </span>,
+                        <span title="Archived assets">
+                            Assets: <strong class="backup-progress">{{backup.handledAssets | sqxKNumber}}</strong>
+                        </span>
+                    </div>
+                    <div *ngIf="backup.stopped && !backup.isFailed">
+                        Download:
+
+                        <a href="{{apiUrl.buildUrl(backup.downloadUrl)}}" sqxExternalLink="noicon">
+                            Ready <i class="icon-external-link"></i>
+                        </a>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <button type="button" class="btn btn-text-danger mt-1"
+                        [disabled]="!backup.canDelete"
+                        (sqxConfirmClick)="delete()"
+                        confirmTitle="Delete backup"
+                        confirmText="Do you really want to delete the backup?">
+                        <i class="icon-bin2"></i>
+                    </button>
+                </div>
+            </div>
+        </div>`,
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class BackupComponent {
+    @Input()
+    public backup: BackupDto;
+
+    public get duration() {
+        return Duration.create(this.backup.started, this.backup.stopped!).toString();
+    }
+
+    constructor(
+        public readonly apiUrl: ApiUrlConfig, private readonly backupsState: BackupsState
+    ) {
+    }
+
+    public delete() {
+        this.backupsState.delete(this.backup);
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html
index 820645e5b..60632ea47 100644
--- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html
+++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Backups | Settings" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Backups"></sqx-title>
 
 <sqx-panel desiredWidth="50rem" [showSidebar]="true">
     <ng-container title>
@@ -30,56 +30,10 @@
                     Start Backup
                 </button>
             </div>
-            
-            <div class="table-items-row" *ngFor="let backup of backups; trackBy: trackByBackup">
-                <div class="row">
-                    <div class="col-auto" [ngSwitch]="backup.status">
-                        <sqx-status-icon size="lg" [status]="backup.status"></sqx-status-icon>
-                    </div>
-                    <div class="col-auto">
-                        <div>
-                            Started:
-                        </div>
-                        <div>
-                            Duration:
-                        </div>
-                    </div>
-                    <div class="col-3">
-                        <div>
-                            {{backup.started | sqxFromNow}}
-                        </div>
-                        <div *ngIf="backup.stopped">
-                            {{backup | sqxBackupDuration}}
-                        </div>
-                    </div>
-                    <div class="col">
-                        <div>
-                            <span title="Archived events">
-                                Events: <strong class="backup-progress">{{backup.handledEvents | sqxKNumber}}</strong>
-                            </span>, 
-                            <span title="Archived assets">
-                                Assets: <strong class="backup-progress">{{backup.handledAssets | sqxKNumber}}</strong> 
-                            </span>
-                        </div>
-                        <div *ngIf="backup.stopped && !backup.isFailed">
-                            Download:
 
-                            <a href="{{apiUrl.buildUrl(backup.downloadUrl)}}" sqxExternalLink="noicon">
-                                Ready <i class="icon-external-link"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="col-auto">
-                        <button type="button" class="btn btn-text-danger mt-1"
-                            [disabled]="!backup.canDelete"
-                            (sqxConfirmClick)="delete(backup)" 
-                            confirmTitle="Delete backup"
-                            confirmText="Do you really want to delete the backup?">
-                            <i class="icon-bin2"></i>
-                        </button>
-                    </div>
-                </div>
-            </div>
+            <sqx-backup *ngFor="let backup of backups; trackBy: trackByBackup"
+                [backup]="backup">
+            </sqx-backup>
         </ng-container>
     </ng-container>
 
diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts
index 13c0ce496..96299f082 100644
--- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts
@@ -11,7 +11,6 @@ import { onErrorResumeNext, switchMap } from 'rxjs/operators';
 
 import {
     ApiUrlConfig,
-    AppsState,
     BackupDto,
     BackupsState,
     ResourceOwner
@@ -25,7 +24,6 @@ import {
 export class BackupsPageComponent extends ResourceOwner implements OnInit {
     constructor(
         public readonly apiUrl: ApiUrlConfig,
-        public readonly appsState: AppsState,
         public readonly backupsState: BackupsState
     ) {
         super();
@@ -47,12 +45,7 @@ export class BackupsPageComponent extends ResourceOwner implements OnInit {
         this.backupsState.start();
     }
 
-    public delete(backup: BackupDto) {
-        this.backupsState.delete(backup);
-    }
-
     public trackByBackup(index: number, item: BackupDto) {
         return item.id;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/backups/pipes.ts b/src/Squidex/app/features/settings/pages/backups/pipes.ts
deleted file mode 100644
index d73192f42..000000000
--- a/src/Squidex/app/features/settings/pages/backups/pipes.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Squidex Headless CMS
- *
- * @license
- * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
- */
-
-import { Pipe, PipeTransform } from '@angular/core';
-
-import { BackupDto, Duration } from '@app/shared';
-
-@Pipe({
-    name: 'sqxBackupDuration',
-    pure: true
-})
-export class BackupDurationPipe implements PipeTransform {
-    public transform(backup: BackupDto) {
-        return Duration.create(backup.started, backup.stopped!).toString();
-    }
-}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/clients/client-add-form.component.ts b/src/Squidex/app/features/settings/pages/clients/client-add-form.component.ts
new file mode 100644
index 000000000..e48e6f9ac
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/clients/client-add-form.component.ts
@@ -0,0 +1,60 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
+
+import { AddClientForm, ClientsState } from '@app/shared';
+
+@Component({
+    selector: 'sqx-client-add-form',
+    template: `
+        <div class="table-items-footer">
+            <form [formGroup]="addClientForm.form" (ngSubmit)="addClient()">
+                <div class="row no-gutters">
+                    <div class="col">
+                        <sqx-control-errors for="name" [submitted]="addClientForm.submitted | async"></sqx-control-errors>
+
+                        <input type="text" class="form-control" formControlName="name" maxlength="40" placeholder="Enter client name" autocomplete="off" sqxTransformInput="LowerCase" />
+                    </div>
+                    <div class="col-auto pl-1">
+                        <button type="submit" class="btn btn-success" [disabled]="addClientForm.hasNoName | async">Add Client</button>
+                    </div>
+                    <div class="col-auto pl-1">
+                        <button type="reset" class="btn btn-secondary" (click)="cancel()">Cancel</button>
+                    </div>
+                </div>
+            </form>
+        </div>`,
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class ClientAddFormComponent {
+    public addClientForm = new AddClientForm(this.formBuilder);
+
+    constructor(
+        private readonly clientsState: ClientsState,
+        private readonly formBuilder: FormBuilder
+    ) {
+    }
+
+    public addClient() {
+        const value = this.addClientForm.submit();
+
+        if (value) {
+            this.clientsState.attach({ id: value.name })
+                .subscribe(() => {
+                    this.addClientForm.submitCompleted();
+                }, error => {
+                    this.addClientForm.submitFailed(error);
+                });
+        }
+    }
+
+    public cancel() {
+        this.addClientForm.submitCompleted();
+    }
+}
\ No newline at end of file
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 fc92677c5..31f809387 100644
--- a/src/Squidex/app/features/settings/pages/clients/client.component.ts
+++ b/src/Squidex/app/features/settings/pages/clients/client.component.ts
@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 
 import {
     AccessTokenDto,
@@ -16,13 +16,18 @@ import {
     ClientsState,
     DialogModel,
     DialogService,
+    fadeAnimation,
     RoleDto
 } from '@app/shared';
 
 @Component({
     selector: 'sqx-client',
     styleUrls: ['./client.component.scss'],
-    templateUrl: './client.component.html'
+    templateUrl: './client.component.html',
+    animations: [
+        fadeAnimation
+    ],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ClientComponent implements OnChanges {
     @Input()
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 420a3d3bb..344e4efb2 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
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Clients | Settings" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Clients"></sqx-title>
 
 <sqx-panel desiredWidth="50rem" [showSidebar]="true">
     <ng-container title>
@@ -26,23 +26,7 @@
                 </sqx-client>
             </ng-container>
 
-            <div class="table-items-footer" *ngIf="clientsState.canCreate | async">
-                <form [formGroup]="addClientForm.form" (ngSubmit)="attachClient()">
-                    <div class="row no-gutters">
-                        <div class="col">
-                            <sqx-control-errors for="name" [submitted]="addClientForm.submitted | async"></sqx-control-errors>
-                                
-                            <input type="text" class="form-control" formControlName="name" maxlength="40" placeholder="Enter client name" autocomplete="off" sqxTransformInput="LowerCase" />
-                        </div>
-                        <div class="col-auto pl-1">
-                            <button type="submit" class="btn btn-success" [disabled]="addClientForm.hasNoName | async">Add Client</button>
-                        </div>
-                        <div class="col-auto pl-1">
-                            <button type="reset" class="btn btn-secondary" (click)="cancelAttachClient()">Cancel</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
+            <sqx-client-add-form *ngIf="clientsState.canCreate | async"></sqx-client-add-form>
         </ng-container>
     </ng-container>
 
diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts b/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts
index 48bc18f61..0dd9ea0e3 100644
--- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts
@@ -6,11 +6,8 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
 
 import {
-    AddClientForm,
-    AppsState,
     ClientDto,
     ClientsState,
     RolesState
@@ -22,13 +19,9 @@ import {
     templateUrl: './clients-page.component.html'
 })
 export class ClientsPageComponent implements OnInit {
-    public addClientForm = new AddClientForm(this.formBuilder);
-
     constructor(
-        public readonly appsState: AppsState,
         public readonly clientsState: ClientsState,
-        public readonly rolesState: RolesState,
-        private readonly formBuilder: FormBuilder
+        public readonly rolesState: RolesState
     ) {
     }
 
@@ -42,24 +35,7 @@ export class ClientsPageComponent implements OnInit {
         this.clientsState.load(true);
     }
 
-    public attachClient() {
-        const value = this.addClientForm.submit();
-
-        if (value) {
-            this.clientsState.attach({ id: value.name })
-                .subscribe(() => {
-                    this.addClientForm.submitCompleted();
-                }, error => {
-                    this.addClientForm.submitFailed(error);
-                });
-        }
-    }
-
-    public cancelAttachClient() {
-        this.addClientForm.submitCompleted();
-    }
-
-    public trackByClient(index: number, item: ClientDto) {
+    public trackByClient(item: ClientDto) {
         return item.id;
     }
 }
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributor-add-form.component.html b/src/Squidex/app/features/settings/pages/contributors/contributor-add-form.component.html
new file mode 100644
index 000000000..4a48d326e
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/contributors/contributor-add-form.component.html
@@ -0,0 +1,24 @@
+<div class="table-items-header" style="margin: 0">
+    <sqx-form-alert marginTop="0" marginBottom="2" light="true">
+        Just enter the email address to invite someone with no account to the app.
+    </sqx-form-alert>
+
+    <form [formGroup]="assignContributorForm.form" (ngSubmit)="assignContributor()">
+        <div class="row no-gutters">
+            <div class="col">
+                <sqx-autocomplete [source]="usersDataSource" formControlName="user" [inputName]="'contributor'" placeholder="Find existing user" displayProperty="displayName">
+                    <ng-template let-user="$implicit">
+                        <span class="autocomplete-user">
+                            <img class="user-picture autocomplete-user-picture" [attr.src]="user | sqxUserDtoPicture" />
+
+                            <span class="user-name autocomplete-user-name">{{user.displayName}}</span>
+                        </span>
+                    </ng-template>
+                </sqx-autocomplete>
+            </div>
+            <div class="col-auto pl-1">
+                <button type="submit" class="btn btn-success" [disabled]="assignContributorForm.hasNoUser | async">Add Contributor</button>
+            </div>
+        </div>
+    </form>
+</div>
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributor-add-form.component.scss b/src/Squidex/app/features/settings/pages/contributors/contributor-add-form.component.scss
new file mode 100644
index 000000000..7751885f4
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/contributors/contributor-add-form.component.scss
@@ -0,0 +1,16 @@
+@import '_vars';
+@import '_mixins';
+
+.autocomplete-user {
+    & {
+        @include truncate;
+    }
+
+    &-name {
+        margin-left: .25rem;
+    }
+}
+
+.table-items-header {
+    margin: 0;
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributor-add-form.component.ts b/src/Squidex/app/features/settings/pages/contributors/contributor-add-form.component.ts
new file mode 100644
index 000000000..f1bf0cc97
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/contributors/contributor-add-form.component.ts
@@ -0,0 +1,84 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+import { Component, Injectable } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
+import { Observable } from 'rxjs';
+import { withLatestFrom } from 'rxjs/operators';
+
+import {
+    AssignContributorForm,
+    AutocompleteSource,
+    ContributorsState,
+    DialogModel,
+    DialogService,
+    UsersService
+} from '@app/shared';
+
+@Injectable()
+export class UsersDataSource implements AutocompleteSource {
+    constructor(
+        private readonly contributorsState: ContributorsState,
+        private readonly usersService: UsersService
+    ) {
+    }
+
+    public find(query: string): Observable<any[]> {
+        return this.usersService.getUsers(query).pipe(
+            withLatestFrom(this.contributorsState.contributors, (users, contributors) => {
+                const results: any[] = [];
+
+                for (let user of users) {
+                    if (!contributors!.find(t => t.contributorId === user.id)) {
+                        results.push(user);
+                    }
+                }
+                return results;
+            }));
+    }
+}
+
+@Component({
+    selector: 'sqx-contributor-add-form',
+    styleUrls: ['./contributor-add-form.component.scss'],
+    templateUrl: './contributor-add-form.component.html',
+    providers: [
+        UsersDataSource
+    ]
+})
+export class ContributorAddFormComponent {
+    public assignContributorForm = new AssignContributorForm(this.formBuilder);
+
+    public importDialog = new DialogModel();
+
+    constructor(
+        public readonly contributorsState: ContributorsState,
+        public readonly usersDataSource: UsersDataSource,
+        private readonly dialogs: DialogService,
+        private readonly formBuilder: FormBuilder
+    ) {
+    }
+
+    public assignContributor() {
+        const value = this.assignContributorForm.submit();
+
+        if (value) {
+            this.contributorsState.assign(value)
+                .subscribe(isCreated => {
+                    this.assignContributorForm.submitCompleted();
+
+                    if (isCreated) {
+                        this.dialogs.notifyInfo('A new user with the entered email address has been created and assigned as contributor.');
+                    } else {
+                        this.dialogs.notifyInfo('User has been added as contributor.');
+                    }
+                }, error => {
+                    this.assignContributorForm.submitFailed(error);
+                });
+        }
+    }
+}
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributor.component.ts b/src/Squidex/app/features/settings/pages/contributors/contributor.component.ts
new file mode 100644
index 000000000..244dbacba
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/contributors/contributor.component.ts
@@ -0,0 +1,67 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+// tslint:disable: component-selector
+
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
+import {
+    ContributorDto,
+    ContributorsState,
+    RoleDto
+} from '@app/shared';
+
+@Component({
+    selector: '[sqxContributor]',
+    template: `
+        <tr>
+            <td class="cell-user">
+                <img class="user-picture" title="{{contributor.contributorName}}" [attr.src]="contributor.contributorId | sqxUserPicture" />
+            </td>
+            <td class="cell-auto">
+                <span class="user-name table-cell" [innerHTML]="contributor.contributorName | sqxHighlight:search"></span>
+            </td>
+            <td class="cell-time">
+                <select class="form-control"
+                    [ngModel]="contributor.role"
+                    (ngModelChange)="changeRole($event)"
+                    [disabled]="!contributor.canUpdate">
+                    <option *ngFor="let role of roles" [ngValue]="role.name">{{role.name}}</option>
+                </select>
+            </td>
+            <td class="cell-actions">
+                <button type="button" class="btn btn-text-danger" [disabled]="!contributor.canRevoke" (click)="remove()">
+                    <i class="icon-bin2"></i>
+                </button>
+            </td>
+        </tr>
+        <tr class="spacer"></tr>`,
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class ContributorComponent {
+    @Input()
+    public roles: RoleDto[];
+
+    @Input()
+    public search: string;
+
+    @Input('sqxContributor')
+    public contributor: ContributorDto;
+
+    constructor(
+        private readonly contributorsState: ContributorsState
+    ) {
+    }
+
+    public remove() {
+        this.contributorsState.revoke(this.contributor);
+    }
+
+    public changeRole(role: string) {
+        this.contributorsState.assign({ contributorId: this.contributor.contributorId, role });
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
index eaee544c2..90619cb0b 100644
--- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
+++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Contributors | Settings" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Contributors"></sqx-title>
 
 <sqx-panel desiredWidth="50rem" [showSidebar]="true">
     <ng-container title>
@@ -15,7 +15,8 @@
         <div class="form-inline">
             <input class="form-control" placeholder="Search"
                 [ngModel]="contributorsState.query | async"
-                (ngModelChange)="search($event)" />
+                (ngModelChange)="search($event)"
+            />
         </div>
     </ng-container>
 
@@ -29,30 +30,7 @@
             
             <ng-container *ngIf="contributorsState.contributorsPaged | async; let contributors">
                 <ng-container *ngIf="contributorsState.canCreate | async">
-                    <div class="table-items-header">
-                        <sqx-form-alert marginTop="0" marginBottom="2" light="true">
-                            Just enter the email address to invite someone with no account to the app.
-                        </sqx-form-alert>
-
-                        <form [formGroup]="assignContributorForm.form" (ngSubmit)="assignContributor()">
-                            <div class="row no-gutters">
-                                <div class="col">
-                                    <sqx-autocomplete [source]="usersDataSource" formControlName="user" [inputName]="'contributor'" placeholder="Find existing user" displayProperty="displayName">
-                                        <ng-template let-user="$implicit">
-                                            <span class="autocomplete-user">
-                                                <img class="user-picture autocomplete-user-picture" [attr.src]="user | sqxUserDtoPicture" />
-
-                                                <span class="user-name autocomplete-user-name">{{user.displayName}}</span>
-                                            </span>
-                                        </ng-template>
-                                    </sqx-autocomplete>
-                                </div>
-                                <div class="col-auto pl-1">
-                                    <button type="submit" class="btn btn-success" [disabled]="assignContributorForm.hasNoUser | async">Add Contributor</button>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
+                    <sqx-contributor-add-form></sqx-contributor-add-form>
 
                     <div class="import-hint">
                         <sqx-form-hint class="text-right">
@@ -63,33 +41,14 @@
             
                 <ng-container *ngIf="contributors.length > 0; else noContributors">
                     <table class="table table-items table-fixed" *ngIf="rolesState.roles | async; let roles">
-                        <tbody *ngFor="let contributor of contributors; trackBy: trackByContributor">
-                            <tr>
-                                <td class="cell-user">
-                                    <img class="user-picture" title="{{contributor.contributorName}}" [attr.src]="contributor.contributorId | sqxUserPicture" />
-                                </td>
-                                <td class="cell-auto">
-                                    <span class="user-name table-cell" [innerHTML]="contributor.contributorName | sqxHighlight:contributorsState.snapshot.queryRegex"></span>
-                                </td>
-                                <td class="cell-time">
-                                    <select class="form-control" 
-                                        [ngModel]="contributor.role"
-                                        (ngModelChange)="changeRole(contributor, $event)"
-                                        [disabled]="!contributor.canUpdate">
-                                        <option *ngFor="let role of roles" [ngValue]="role.name">{{role.name}}</option>
-                                    </select>
-                                </td>
-                                <td class="cell-actions">
-                                    <button type="button" class="btn btn-text-danger" [disabled]="!contributor.canRevoke" (click)="remove(contributor)">
-                                        <i class="icon-bin2"></i>
-                                    </button>
-                                </td>
-                            </tr>
-                            <tr class="spacer"></tr>
+                        <tbody *ngFor="let contributor of contributors; trackBy: trackByContributor"
+                            [sqxContributor]="contributor"
+                            [search]="contributorsState.snapshot.queryRegex"
+                            [roles]="roles">
                         </tbody>
                     </table>
 
-                    <sqx-pager [pager]="contributorsState.contributorsPager | async" [hideWhenButtonsDisabled]="true" (prevPage)="goPrev()" (nextPage)="goNext()"></sqx-pager>
+                    <sqx-pager [pager]="contributorsState.contributorsPager | async" [autoHide]="true" (prevPage)="goPrev()" (nextPage)="goNext()"></sqx-pager>
                 </ng-container>
 
                 <ng-template #noContributors>
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss
index 56afd85b9..a5feb1f2d 100644
--- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss
+++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss
@@ -1,22 +1,8 @@
 @import '_vars';
 @import '_mixins';
 
-.autocomplete-user {
-    & {
-        @include truncate;
-    }
-
-    &-name {
-        margin-left: .25rem;
-    }
-}
-
 .import-hint {
     margin-bottom: 1rem;
     font-weight: normal;
     font-size: 90%;
-}
-
-.table-items-header {
-    margin: 0;
 }
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts
index fdc6143c7..974e5f369 100644
--- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts
@@ -5,66 +5,26 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Component, Injectable, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
-import { Observable } from 'rxjs';
-import { withLatestFrom } from 'rxjs/operators';
+import { Component, OnInit } from '@angular/core';
 
 import {
-    AppsState,
-    AssignContributorForm,
-    AutocompleteSource,
     ContributorDto,
     ContributorsState,
     DialogModel,
-    DialogService,
-    RolesState,
-    UsersService
+    RolesState
 } from '@app/shared';
 
-@Injectable()
-export class UsersDataSource implements AutocompleteSource {
-    constructor(
-        private readonly contributorsState: ContributorsState,
-        private readonly usersService: UsersService
-    ) {
-    }
-
-    public find(query: string): Observable<any[]> {
-        return this.usersService.getUsers(query).pipe(
-            withLatestFrom(this.contributorsState.contributors, (users, contributors) => {
-                const results: any[] = [];
-
-                for (let user of users) {
-                    if (!contributors!.find(t => t.contributorId === user.id)) {
-                        results.push(user);
-                    }
-                }
-                return results;
-            }));
-    }
-}
-
 @Component({
     selector: 'sqx-contributors-page',
     styleUrls: ['./contributors-page.component.scss'],
-    templateUrl: './contributors-page.component.html',
-    providers: [
-        UsersDataSource
-    ]
+    templateUrl: './contributors-page.component.html'
 })
 export class ContributorsPageComponent implements OnInit {
-    public assignContributorForm = new AssignContributorForm(this.formBuilder);
-
     public importDialog = new DialogModel();
 
     constructor(
-        public readonly appsState: AppsState,
         public readonly contributorsState: ContributorsState,
-        public readonly rolesState: RolesState,
-        public readonly usersDataSource: UsersDataSource,
-        private readonly dialogs: DialogService,
-        private readonly formBuilder: FormBuilder
+        public readonly rolesState: RolesState
     ) {
     }
 
@@ -90,34 +50,7 @@ export class ContributorsPageComponent implements OnInit {
         this.contributorsState.search(query);
     }
 
-    public remove(contributor: ContributorDto) {
-        this.contributorsState.revoke(contributor);
-    }
-
-    public changeRole(contributor: ContributorDto, role: string) {
-        this.contributorsState.assign({ contributorId: contributor.contributorId, role });
-    }
-
-    public assignContributor() {
-        const value = this.assignContributorForm.submit();
-
-        if (value) {
-            this.contributorsState.assign(value)
-                .subscribe(isCreated => {
-                    this.assignContributorForm.submitCompleted();
-
-                    if (isCreated) {
-                        this.dialogs.notifyInfo('A new user with the entered email address has been created and assigned as contributor.');
-                    } else {
-                        this.dialogs.notifyInfo('User has been added as contributor.');
-                    }
-                }, error => {
-                    this.assignContributorForm.submitFailed(error);
-                });
-        }
-    }
-
-    public trackByContributor(index: number, contributor: ContributorDto) {
+    public trackByContributor(contributor: ContributorDto) {
         return contributor.contributorId;
     }
 }
diff --git a/src/Squidex/app/features/settings/pages/languages/language-add-form.component.ts b/src/Squidex/app/features/settings/pages/languages/language-add-form.component.ts
new file mode 100644
index 000000000..5d3f131a9
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/languages/language-add-form.component.ts
@@ -0,0 +1,69 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
+
+import {
+    AddLanguageForm,
+    ImmutableArray,
+    LanguageDto,
+    LanguagesState
+} from '@app/shared';
+
+@Component({
+    selector: 'sqx-language-add-form',
+    template: `
+        <div class="table-items-footer">
+            <form [formGroup]="addLanguageForm.form" (ngSubmit)="addLanguage()">
+                <div class="row no-gutters">
+                    <div class="col">
+                        <select class="form-control" formControlName="language">
+                            <option *ngFor="let language of newLanguages" [ngValue]="language">{{language.englishName}}</option>
+                        </select>
+                    </div>
+                    <div class="col-auto pl-1">
+                        <button type="submit" class="btn btn-success">Add Language</button>
+                    </div>
+                </div>
+            </form>
+        </div>`,
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class LanguageAddFormComponent implements OnChanges {
+    @Input()
+    public newLanguages: ImmutableArray<LanguageDto>;
+
+    public addLanguageForm = new AddLanguageForm(this.formBuilder);
+
+    constructor(
+        private readonly languagesState: LanguagesState,
+        private readonly formBuilder: FormBuilder
+    ) {
+    }
+
+    public ngOnChanges() {
+        if (this.newLanguages.length > 0) {
+            const language = this.newLanguages.at(0);
+
+            this.addLanguageForm.load({ language });
+        }
+    }
+
+    public addLanguage() {
+        const value = this.addLanguageForm.submit();
+
+        if (value) {
+            this.languagesState.add(value.language)
+                .subscribe(() => {
+                    this.addLanguageForm.submitCompleted();
+                }, error => {
+                    this.addLanguageForm.submitFailed(error);
+                });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.ts b/src/Squidex/app/features/settings/pages/languages/language.component.ts
index ecfc7a583..abbbdf1f9 100644
--- a/src/Squidex/app/features/settings/pages/languages/language.component.ts
+++ b/src/Squidex/app/features/settings/pages/languages/language.component.ts
@@ -102,5 +102,4 @@ export class LanguageComponent implements OnChanges {
     public trackByLanguage(index: number, language: AppLanguageDto) {
         return language.iso2Code;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html
index ab5435476..c3c67f976 100644
--- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html
+++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Languages | Settings" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Languages"></sqx-title>
 
 <sqx-panel desiredWidth="50rem" [showSidebar]="true">
     <ng-container title>
@@ -21,22 +21,9 @@
                 [fallbackLanguagesNew]="languageInfo.fallbackLanguagesNew">
             </sqx-language>
 
-            <ng-container *ngIf="languagesState.newLanguages | async; let newLanguages">
-                <div class="table-items-footer" *ngIf="languagesState.canCreate | async">
-                    <form [formGroup]="addLanguageForm.form" (ngSubmit)="addLanguage()">
-                        <div class="row no-gutters">
-                            <div class="col">
-                                <select class="form-control" formControlName="language">
-                                    <option *ngFor="let language of newLanguages" [ngValue]="language">{{language.englishName}}</option>
-                                </select>
-                            </div>
-                            <div class="col-auto pl-1">
-                                <button type="submit" class="btn btn-success">Add Language</button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </ng-container>
+            <sqx-language-add-form *ngIf="languagesState.canCreate | async"
+                [newLanguages]="languagesState.newLanguages | async">
+            </sqx-language-add-form>
         </ng-container>
     </ng-container>
 
diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
index 801714dd4..3b75d29fe 100644
--- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
@@ -6,41 +6,21 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
 
-import {
-    AddLanguageForm,
-    AppLanguageDto,
-    AppsState,
-    LanguagesState,
-    ResourceOwner
-} from '@app/shared';
+import { AppLanguageDto, LanguagesState } from '@app/shared';
 
 @Component({
     selector: 'sqx-languages-page',
     styleUrls: ['./languages-page.component.scss'],
     templateUrl: './languages-page.component.html'
 })
-export class LanguagesPageComponent extends ResourceOwner implements OnInit {
-    public addLanguageForm = new AddLanguageForm(this.formBuilder);
-
+export class LanguagesPageComponent implements OnInit {
     constructor(
-        public readonly appsState: AppsState,
-        public readonly languagesState: LanguagesState,
-        private readonly formBuilder: FormBuilder
+        public readonly languagesState: LanguagesState
     ) {
-        super();
     }
 
     public ngOnInit() {
-        this.own(
-            this.languagesState.newLanguages
-                .subscribe(languages => {
-                    if (languages.length > 0) {
-                        this.addLanguageForm.load({ language: languages.at(0) });
-                    }
-                }));
-
         this.languagesState.load();
     }
 
@@ -48,21 +28,7 @@ export class LanguagesPageComponent extends ResourceOwner implements OnInit {
         this.languagesState.load(true);
     }
 
-    public addLanguage() {
-        const value = this.addLanguageForm.submit();
-
-        if (value) {
-            this.languagesState.add(value.language)
-                .subscribe(() => {
-                    this.addLanguageForm.submitCompleted();
-                }, error => {
-                    this.addLanguageForm.submitFailed(error);
-                });
-        }
-    }
-
     public trackByLanguage(index: number, language: { language: AppLanguageDto }) {
         return language.language.iso2Code;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/more/more-page.component.html b/src/Squidex/app/features/settings/pages/more/more-page.component.html
index 172e1b7ad..879682bdb 100644
--- a/src/Squidex/app/features/settings/pages/more/more-page.component.html
+++ b/src/Squidex/app/features/settings/pages/more/more-page.component.html
@@ -1,5 +1,3 @@
-<sqx-title message="{app} | More | Settings" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
-
 <sqx-panel desiredWidth="46rem" [showClose]="false">
     <ng-container title>
         Settings
diff --git a/src/Squidex/app/features/settings/pages/more/more-page.component.ts b/src/Squidex/app/features/settings/pages/more/more-page.component.ts
index 4ef82302e..58b5f4cb3 100644
--- a/src/Squidex/app/features/settings/pages/more/more-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/more/more-page.component.ts
@@ -35,7 +35,7 @@ export class MorePageComponent extends ResourceOwner implements OnInit {
     public updateForm = new UpdateAppForm(this.formBuilder);
 
     constructor(
-        public readonly appsState: AppsState,
+        private readonly appsState: AppsState,
         private readonly formBuilder: FormBuilder,
         private readonly router: Router
     ) {
@@ -46,16 +46,14 @@ export class MorePageComponent extends ResourceOwner implements OnInit {
         this.own(
             this.appsState.selectedApp
                 .subscribe(app => {
-                    if (app) {
-                        this.app = app;
+                    this.app = app;
 
-                        this.isDeletable = app.canDelete;
-                        this.isEditable = app.canUpdateGeneral;
-                        this.isImageEditable = app.canUpdateImage;
+                    this.isDeletable = app.canDelete;
+                    this.isEditable = app.canUpdateGeneral;
+                    this.isImageEditable = app.canUpdateImage;
 
-                        this.updateForm.load(app);
-                        this.updateForm.setEnabled(this.isEditable);
-                    }
+                    this.updateForm.load(app);
+                    this.updateForm.setEnabled(this.isEditable);
                 }));
     }
 
@@ -114,5 +112,4 @@ export class MorePageComponent extends ResourceOwner implements OnInit {
                 this.router.navigate(['/app']);
             });
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts b/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts
index b5cbec0a8..a74b2a2dc 100644
--- a/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts
+++ b/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts
@@ -5,11 +5,12 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 
 import {
     EditPatternForm,
+    fadeAnimation,
     PatternDto,
     PatternsState
 } from '@app/shared';
@@ -17,7 +18,11 @@ import {
 @Component({
     selector: 'sqx-pattern',
     styleUrls: ['./pattern.component.scss'],
-    templateUrl: './pattern.component.html'
+    templateUrl: './pattern.component.html',
+    animations: [
+        fadeAnimation
+    ],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class PatternComponent implements OnChanges {
     @Input()
@@ -77,5 +82,4 @@ export class PatternComponent implements OnChanges {
             }
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html
index 293faa1cc..714657e68 100644
--- a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html
+++ b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Patterns | Settings" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Patterns"></sqx-title>
 
 <sqx-panel desiredWidth="63rem" [showSidebar]="true">
     <ng-container title>
diff --git a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts
index a99b188e0..fef441487 100644
--- a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts
@@ -8,7 +8,6 @@
 import { Component, OnInit } from '@angular/core';
 
 import {
-    AppsState,
     PatternDto,
     PatternsState
 } from '@app/shared';
@@ -20,7 +19,6 @@ import {
 })
 export class PatternsPageComponent implements OnInit {
     constructor(
-        public readonly appsState: AppsState,
         public readonly patternsState: PatternsState
     ) {
     }
diff --git a/src/Squidex/app/features/settings/pages/plans/plan.component.html b/src/Squidex/app/features/settings/pages/plans/plan.component.html
new file mode 100644
index 000000000..39cb13ae8
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/plans/plan.component.html
@@ -0,0 +1,44 @@
+<div class="card plan float-left">
+    <div class="card-header text-center">
+        <h4 class="card-title">{{planInfo.plan.name}}</h4>
+        <h5 class="plan-price">{{planInfo.plan.costs}}</h5>
+
+        <small class="text-muted">Per Month</small>
+    </div>
+    <div class="card-body">
+        <div class="plan-fact text-center">
+            <div>
+                <strong>{{planInfo.plan.maxApiCalls | sqxKNumber}}</strong> API Calls
+            </div>
+            <div>
+                {{planInfo.plan.maxAssetSize | sqxFileSize}} Storage
+            </div>
+            <div>
+                {{planInfo.plan.maxContributors}} Contributors
+            </div>
+        </div>
+    
+        <button *ngIf="planInfo.isSelected" class="btn btn-block btn-text-success plan-selected">
+            &#10003; Selected
+        </button>
+        
+        <button *ngIf="!planInfo.isSelected" class="btn btn-block btn-success" [disabled]="plansState.isDisabled | async" (click)="changeMonthly()">
+            Change
+        </button>
+    </div>
+    <div class="card-footer" *ngIf="planInfo.plan.yearlyId">
+        <div class="text-center">
+            <h5 class="plan-price">{{planInfo.plan.yearlyCosts}}</h5>
+
+            <small class="text-muted">Per Year</small>
+        </div>
+
+        <button *ngIf="planInfo.isYearlySelected" class="btn btn-block btn-text-success plan-selected">
+            &#10003; Selected
+        </button>
+        
+        <button *ngIf="!planInfo.isYearlySelected" class="btn btn-block btn-success" [disabled]="plansState.isDisabled | async" (click)="changeYearly()">
+            Change
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/plans/plan.component.scss b/src/Squidex/app/features/settings/pages/plans/plan.component.scss
new file mode 100644
index 000000000..09ed842c3
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/plans/plan.component.scss
@@ -0,0 +1,34 @@
+@import '_vars';
+@import '_mixins';
+
+.plan {
+    & {
+        min-width: 13rem;
+        max-width: 20rem;
+        margin: .5rem;
+    }
+
+    &-price {
+        color: $color-theme-blue;
+        margin-top: 0;
+        margin-bottom: 0;
+    }
+
+    &-selected {
+        pointer-events: none;
+    }
+
+    &-fact {
+        line-height: 1.8rem;
+    }
+
+    .btn {
+        margin-top: 1rem;
+    }
+}
+
+.card-footer,
+.card-header,
+.card-body {
+    padding: 1rem;
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/plans/plan.component.ts b/src/Squidex/app/features/settings/pages/plans/plan.component.ts
new file mode 100644
index 000000000..0a751291c
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/plans/plan.component.ts
@@ -0,0 +1,41 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
+import {
+    fadeAnimation,
+    PlanInfo,
+    PlansState
+} from '@app/shared';
+
+@Component({
+    selector: 'sqx-plan',
+    styleUrls: ['./plan.component.scss'],
+    templateUrl: './plan.component.html',
+    animations: [
+        fadeAnimation
+    ],
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PlanComponent {
+    @Input()
+    public planInfo: PlanInfo;
+
+    constructor(
+        public readonly plansState: PlansState
+    ) {
+    }
+
+    public changeMonthly() {
+        this.plansState.change(this.planInfo.plan.id);
+    }
+
+    public changeYearly() {
+        this.plansState.change(this.planInfo.plan.yearlyId);
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html
index d7a31c246..fffdf96e3 100644
--- a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html
+++ b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html
@@ -1,8 +1,8 @@
-<sqx-title message="{app} | Plans | Settings" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Subscription"></sqx-title>
 
 <sqx-panel desiredWidth="64rem" [showSidebar]="true" [scrollX]="true">
     <ng-container title>
-        Update Plan
+        Subscription
     </ng-container>
 
     <ng-container menu>
@@ -24,50 +24,9 @@
             </div>
 
             <div class="clearfix">
-                <div class="card plan float-left" *ngFor="let planInfo of plans; trackBy: trackByPlan">
-                    <div class="card-header text-center">
-                        <h4 class="card-title">{{planInfo.plan.name}}</h4>
-                        <h5 class="plan-price">{{planInfo.plan.costs}}</h5>
-
-                        <small class="text-muted">Per Month</small>
-                    </div>
-                    <div class="card-body">
-                        <div class="plan-fact text-center">
-                            <div>
-                                <strong>{{planInfo.plan.maxApiCalls | sqxKNumber}}</strong> API Calls
-                            </div>
-                            <div>
-                                {{planInfo.plan.maxAssetSize | sqxFileSize}} Storage
-                            </div>
-                            <div>
-                                {{planInfo.plan.maxContributors}} Contributors
-                            </div>
-                        </div>
-                    
-                        <button *ngIf="planInfo.isSelected" class="btn btn-block btn-text-success plan-selected">
-                            &#10003; Selected
-                        </button>
-                        
-                        <button *ngIf="!planInfo.isSelected" class="btn btn-block btn-success" [disabled]="plansState.isDisabled | async" (click)="change(planInfo.plan.id)">
-                            Change
-                        </button>
-                    </div>
-                    <div class="card-footer" *ngIf="planInfo.plan.yearlyId">
-                        <div class="text-center">
-                            <h5 class="plan-price">{{planInfo.plan.yearlyCosts}}</h5>
-
-                            <small class="text-muted">Per Year</small>
-                        </div>
-
-                        <button *ngIf="planInfo.isYearlySelected" class="btn btn-block btn-text-success plan-selected">
-                            &#10003; Selected
-                        </button>
-                        
-                        <button *ngIf="!planInfo.isYearlySelected" class="btn btn-block btn-success" [disabled]="plansState.isDisabled | async" (click)="change(planInfo.plan.yearlyId)">
-                            Change
-                        </button>
-                    </div>
-                </div>
+                <sqx-plan *ngFor="let planInfo of plans; trackBy: trackByPlan"
+                    [planInfo]="planInfo">
+                </sqx-plan>
             </div>
 
             <div *ngIf="plansState.hasPortal | async" class="billing-portal-link">
diff --git a/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts b/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts
index ec4c90da8..35a642df6 100644
--- a/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts
@@ -10,7 +10,6 @@ import { ActivatedRoute } from '@angular/router';
 
 import {
     ApiUrlConfig,
-    AppsState,
     PlanDto,
     PlansState
 } from '@app/shared';
@@ -26,7 +25,6 @@ export class PlansPageComponent implements OnInit {
     public portalUrl = this.apiUrl.buildUrl('/portal/');
 
     constructor(
-        public readonly appsState: AppsState,
         public readonly plansState: PlansState,
         private readonly apiUrl: ApiUrlConfig,
         private readonly route: ActivatedRoute
@@ -34,9 +32,10 @@ export class PlansPageComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.route.queryParams.subscribe(params => {
-            this.overridePlanId = params['planId'];
-        }).unsubscribe();
+        this.route.queryParams
+            .subscribe(params => {
+                this.overridePlanId = params['planId'];
+            }).unsubscribe();
 
         this.plansState.load(false, this.overridePlanId);
     }
@@ -45,12 +44,7 @@ export class PlansPageComponent implements OnInit {
         this.plansState.load(true, this.overridePlanId);
     }
 
-    public change(planId: string) {
-        this.plansState.change(planId);
-    }
-
     public trackByPlan(index: number, planInfo: { plan: PlanDto }) {
         return planInfo.plan.id;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/roles/role-add-form.component.ts b/src/Squidex/app/features/settings/pages/roles/role-add-form.component.ts
new file mode 100644
index 000000000..fd3279cc2
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/roles/role-add-form.component.ts
@@ -0,0 +1,60 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
+
+import { AddRoleForm, RolesState } from '@app/shared';
+
+@Component({
+    selector: 'sqx-role-add-form',
+    template: `
+        <div class="table-items-footer">
+            <form [formGroup]="addRoleForm.form" (ngSubmit)="addRole()">
+                <div class="row no-gutters">
+                    <div class="col">
+                        <sqx-control-errors for="name" [submitted]="addRoleForm.submitted | async"></sqx-control-errors>
+
+                        <input type="text" class="form-control" formControlName="name" maxlength="40" placeholder="Enter role name" autocomplete="off" />
+                    </div>
+                    <div class="col-auto pl-1">
+                        <button type="submit" class="btn btn-success" [disabled]="addRoleForm.hasNoName | async">Add role</button>
+                    </div>
+                    <div class="col-auto pl-1">
+                        <button type="reset" class="btn btn-secondary" (click)="cancel()">Cancel</button>
+                    </div>
+                </div>
+            </form>
+        </div>`,
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class RoleAddFormComponent {
+    public addRoleForm = new AddRoleForm(this.formBuilder);
+
+    constructor(
+        private readonly rolesState: RolesState,
+        private readonly formBuilder: FormBuilder
+    ) {
+    }
+
+    public addRole() {
+        const value = this.addRoleForm.submit();
+
+        if (value) {
+            this.rolesState.add(value)
+                .subscribe(() => {
+                    this.addRoleForm.submitCompleted();
+                }, error => {
+                    this.addRoleForm.submitFailed(error);
+                });
+        }
+    }
+
+    public cancel() {
+        this.addRoleForm.submitCompleted();
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/roles/role.component.html b/src/Squidex/app/features/settings/pages/roles/role.component.html
index e7cccd4b0..a24b3a5fa 100644
--- a/src/Squidex/app/features/settings/pages/roles/role.component.html
+++ b/src/Squidex/app/features/settings/pages/roles/role.component.html
@@ -18,7 +18,7 @@
 
                     <button type="button" class="btn btn-text-danger"
                         [disabled]="!role.canDelete"
-                        (sqxConfirmClick)="remove()"
+                        (sqxConfirmClick)="delete()"
                         confirmTitle="Delete role" 
                         confirmText="Do you really want to delete the role?">
                         <i class="icon-bin2"></i>
diff --git a/src/Squidex/app/features/settings/pages/roles/role.component.ts b/src/Squidex/app/features/settings/pages/roles/role.component.ts
index 3693c8ed6..1332d8016 100644
--- a/src/Squidex/app/features/settings/pages/roles/role.component.ts
+++ b/src/Squidex/app/features/settings/pages/roles/role.component.ts
@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Component, Input, OnChanges, ViewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnChanges, ViewChild } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 
 import {
@@ -24,7 +24,8 @@ import {
     templateUrl: './role.component.html',
     animations: [
         fadeAnimation
-    ]
+    ],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class RoleComponent implements OnChanges {
     @Input()
@@ -60,12 +61,12 @@ export class RoleComponent implements OnChanges {
         this.isEditing = !this.isEditing;
     }
 
-    public removePermission(index: number) {
-        this.editForm.remove(index);
+    public delete() {
+        this.rolesState.delete(this.role);
     }
 
-    public remove() {
-        this.rolesState.delete(this.role);
+    public removePermission(index: number) {
+        this.editForm.remove(index);
     }
 
     public addPermission() {
@@ -95,5 +96,4 @@ export class RoleComponent implements OnChanges {
                 });
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/roles/roles-page.component.html b/src/Squidex/app/features/settings/pages/roles/roles-page.component.html
index 089f9d420..dc5d2342e 100644
--- a/src/Squidex/app/features/settings/pages/roles/roles-page.component.html
+++ b/src/Squidex/app/features/settings/pages/roles/roles-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Roles | Settings" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Roles"></sqx-title>
 
 <sqx-panel desiredWidth="50rem" [showSidebar]="true">
     <ng-container title>
@@ -17,23 +17,7 @@
         <ng-container *ngIf="(rolesState.isLoaded | async) && (rolesState.roles | async); let roles">
             <sqx-role *ngFor="let role of roles" [role]="role" [allPermissions]="allPermissions"></sqx-role>
 
-            <div class="table-items-footer" *ngIf="rolesState.canCreate | async">
-                <form [formGroup]="addRoleForm.form" (ngSubmit)="addRole()">
-                    <div class="row no-gutters">
-                        <div class="col">
-                            <sqx-control-errors for="name" [submitted]="addRoleForm.submitted | async"></sqx-control-errors>
-                                
-                            <input type="text" class="form-control" formControlName="name" maxlength="40" placeholder="Enter role name" autocomplete="off" />
-                        </div>
-                        <div class="col-auto pl-1">
-                            <button type="submit" class="btn btn-success" [disabled]="addRoleForm.hasNoName | async">Add role</button>
-                        </div>
-                        <div class="col-auto pl-1">
-                            <button type="reset" class="btn btn-secondary" (click)="cancelAddRole()">Cancel</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
+            <sqx-role-add-form *ngIf="rolesState.canCreate | async"></sqx-role-add-form>
         </ng-container>
     </ng-container>
 
diff --git a/src/Squidex/app/features/settings/pages/roles/roles-page.component.ts b/src/Squidex/app/features/settings/pages/roles/roles-page.component.ts
index f70cb83f6..d09411ec2 100644
--- a/src/Squidex/app/features/settings/pages/roles/roles-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/roles/roles-page.component.ts
@@ -6,11 +6,9 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
 import { Observable, of } from 'rxjs';
 
 import {
-    AddRoleForm,
     AppsState,
     AutocompleteSource,
     RoleDto,
@@ -36,15 +34,12 @@ class PermissionsAutocomplete implements AutocompleteSource {
     templateUrl: './roles-page.component.html'
 })
 export class RolesPageComponent implements OnInit {
-    public addRoleForm = new AddRoleForm(this.formBuilder);
-
     public allPermissions: AutocompleteSource = new PermissionsAutocomplete(this.appsState, this.rolesService);
 
     constructor(
-        public readonly appsState: AppsState,
+        private readonly appsState: AppsState,
         public readonly rolesService: RolesService,
-        public readonly rolesState: RolesState,
-        private readonly formBuilder: FormBuilder
+        public readonly rolesState: RolesState
     ) {
     }
 
@@ -56,25 +51,7 @@ export class RolesPageComponent implements OnInit {
         this.rolesState.load(true);
     }
 
-    public cancelAddRole() {
-        this.addRoleForm.submitCompleted();
-    }
-
-    public addRole() {
-        const value = this.addRoleForm.submit();
-
-        if (value) {
-            this.rolesState.add(value)
-                .subscribe(() => {
-                    this.addRoleForm.submitCompleted();
-                }, error => {
-                    this.addRoleForm.submitFailed(error);
-                });
-        }
-    }
-
-    public trackByRole(index: number, role: RoleDto) {
+    public trackByRole(role: RoleDto) {
         return role.name;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/workflows/schema-tag-converter.ts b/src/Squidex/app/features/settings/pages/workflows/schema-tag-converter.ts
index 1f3bd4ab0..a62c558a7 100644
--- a/src/Squidex/app/features/settings/pages/workflows/schema-tag-converter.ts
+++ b/src/Squidex/app/features/settings/pages/workflows/schema-tag-converter.ts
@@ -5,15 +5,36 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Converter, SchemaDto, TagValue } from '@app/shared';
+import { Subscription } from 'rxjs';
+
+import {
+    Converter,
+    SchemaDto,
+    SchemasState,
+    TagValue
+} from '@app/shared';
 
 export class SchemaTagConverter implements Converter {
-    public readonly suggestions: TagValue[];
+    private schemasSubscription: Subscription;
+    private schemas: SchemaDto[] = [];
+
+    public suggestions: TagValue[] = [];
 
     constructor(
-        private readonly schemas: SchemaDto[]
+        readonly schemasState: SchemasState
     ) {
-        this.suggestions = schemas.map(x => new TagValue(x.id, x.name, x.id));
+        this.schemasSubscription =
+            schemasState.changes.subscribe(state => {
+                if (state.isLoaded) {
+                    this.schemas = state.schemas.values;
+
+                    this.suggestions = this.schemas.map(x => new TagValue(x.id, x.name, x.id));
+                }
+            });
+    }
+
+    public destroy() {
+        this.schemasSubscription.unsubscribe();
     }
 
     public convertInput(input: string): TagValue<any> | null {
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflow-add-form.component.ts b/src/Squidex/app/features/settings/pages/workflows/workflow-add-form.component.ts
new file mode 100644
index 000000000..d39ac6459
--- /dev/null
+++ b/src/Squidex/app/features/settings/pages/workflows/workflow-add-form.component.ts
@@ -0,0 +1,60 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
+
+import { AddWorkflowForm, WorkflowsState } from '@app/shared';
+
+@Component({
+    selector: 'sqx-workflow-add-form',
+    template: `
+        <div class="table-items-footer">
+            <form [formGroup]="addWorkflowForm.form" (ngSubmit)="addWorkflow()">
+                <div class="row no-gutters">
+                    <div class="col">
+                        <sqx-control-errors for="name" [submitted]="addWorkflowForm.submitted | async"></sqx-control-errors>
+
+                        <input type="text" class="form-control" formControlName="name" maxlength="40" placeholder="Enter workflow name" autocomplete="off" />
+                    </div>
+                    <div class="col-auto pl-1">
+                        <button type="submit" class="btn btn-success" [disabled]="addWorkflowForm.hasNoName | async">Add Workflow</button>
+                    </div>
+                    <div class="col-auto pl-1">
+                        <button type="reset" class="btn btn-secondary" (click)="cancel()">Cancel</button>
+                    </div>
+                </div>
+            </form>
+        </div>`,
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class WorkflowAddFormComponent {
+    public addWorkflowForm = new AddWorkflowForm(this.formBuilder);
+
+    constructor(
+        private readonly workflowsState: WorkflowsState,
+        private readonly formBuilder: FormBuilder
+    ) {
+    }
+
+    public addWorkflow() {
+        const value = this.addWorkflowForm.submit();
+
+        if (value) {
+            this.workflowsState.add(value.name)
+                .subscribe(() => {
+                    this.addWorkflowForm.submitCompleted();
+                }, error => {
+                    this.addWorkflowForm.submitFailed(error);
+                });
+        }
+    }
+
+    public cancel() {
+        this.addWorkflowForm.submitCompleted();
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.ts b/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.ts
index 13b7b45e1..c33fe36f7 100644
--- a/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.ts
+++ b/src/Squidex/app/features/settings/pages/workflows/workflow-step.component.ts
@@ -23,18 +23,6 @@ import {
     templateUrl: './workflow-step.component.html'
 })
 export class WorkflowStepComponent implements OnChanges {
-    @Input()
-    public workflow: WorkflowDto;
-
-    @Input()
-    public step: WorkflowStep;
-
-    @Input()
-    public roles: RoleDto[];
-
-    @Input()
-    public disabled: boolean;
-
     @Output()
     public makeInitial = new EventEmitter();
 
@@ -56,6 +44,18 @@ export class WorkflowStepComponent implements OnChanges {
     @Output()
     public remove = new EventEmitter();
 
+    @Input()
+    public workflow: WorkflowDto;
+
+    @Input()
+    public step: WorkflowStep;
+
+    @Input()
+    public roles: RoleDto[];
+
+    @Input()
+    public disabled: boolean;
+
     public onBlur = { updateOn: 'blur' };
 
     public openSteps: WorkflowStep[];
@@ -91,5 +91,4 @@ export class WorkflowStepComponent implements OnChanges {
     public trackByTransition(index: number, transition: WorkflowTransition) {
         return transition.to;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.html b/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.html
index 6a56542aa..26392cf38 100644
--- a/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.html
+++ b/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.html
@@ -33,7 +33,7 @@
         <span class="select-placeholder" *ngIf="!transition.role || transition.role === ''">Add Role</span>
     </div>
     <div class="col-auto pl-2">
-        <button type="button" class="btn btn-text-danger" (click)="remove.emit()" [disabled]="disabled">
+        <button type="button" class="btn btn-text-danger" (click)="emitRemove()" [disabled]="disabled">
             <i class="icon-bin2"></i>
         </button>
     </div>
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.ts b/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.ts
index 46e02f769..b83978f94 100644
--- a/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.ts
+++ b/src/Squidex/app/features/settings/pages/workflows/workflow-transition.component.ts
@@ -19,6 +19,12 @@ import {
     templateUrl: './workflow-transition.component.html'
 })
 export class WorkflowTransitionComponent {
+    @Output()
+    public update = new EventEmitter<WorkflowTransitionValues>();
+
+    @Output()
+    public remove = new EventEmitter();
+
     @Input()
     public transition: WorkflowTransitionView;
 
@@ -28,12 +34,6 @@ export class WorkflowTransitionComponent {
     @Input()
     public disabled: boolean;
 
-    @Output()
-    public update = new EventEmitter<WorkflowTransitionValues>();
-
-    @Output()
-    public remove = new EventEmitter();
-
     public onBlur = { updateOn: 'blur' };
 
     public changeExpression(expression: string) {
@@ -44,8 +44,11 @@ export class WorkflowTransitionComponent {
         this.update.emit({ role: role || '' });
     }
 
+    public emitRemove() {
+        this.remove.emit();
+    }
+
     public trackByRole(index: number, role: RoleDto) {
         return role.name;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflow.component.ts b/src/Squidex/app/features/settings/pages/workflows/workflow.component.ts
index afd1c34a9..7e5350ff8 100644
--- a/src/Squidex/app/features/settings/pages/workflows/workflow.component.ts
+++ b/src/Squidex/app/features/settings/pages/workflows/workflow.component.ts
@@ -125,5 +125,4 @@ export class WorkflowComponent implements OnChanges {
     public trackByStep(step: WorkflowStep) {
         return step.name;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.html b/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.html
index 6ffcd5720..c205f6502 100644
--- a/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.html
+++ b/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Workflows | Settings" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Workflows"></sqx-title>
 
 <sqx-panel desiredWidth="60rem" [showSidebar]="true" [isLazyLoaded]="false">
     <ng-container title>
@@ -35,23 +35,7 @@
                     [workflow]="workflow" [roles]="roles" [schemasSource]="schemasSource">
                 </sqx-workflow>
 
-                <div class="table-items-footer" *ngIf="workflowsState.canCreate | async">
-                    <form [formGroup]="addWorkflowForm.form" (ngSubmit)="addWorkflow()">
-                        <div class="row no-gutters">
-                            <div class="col">
-                                <sqx-control-errors for="name" [submitted]="addWorkflowForm.submitted | async"></sqx-control-errors>
-                                    
-                                <input type="text" class="form-control" formControlName="name" maxlength="40" placeholder="Enter workflow name" autocomplete="off" />
-                            </div>
-                            <div class="col-auto pl-1">
-                                <button type="submit" class="btn btn-success" [disabled]="addWorkflowForm.hasNoName | async">Add Workflow</button>
-                            </div>
-                            <div class="col-auto pl-1">
-                                <button type="reset" class="btn btn-secondary" (click)="cancelAddWorkflow()">Cancel</button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
+                <sqx-workflow-add-form *ngIf="workflowsState.canCreate | async"></sqx-workflow-add-form>
             </ng-container>
         </ng-container>
     </ng-container>
diff --git a/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.ts b/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.ts
index 0ecaf7f8c..903ee3475 100644
--- a/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/workflows/workflows-page.component.ts
@@ -5,13 +5,9 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 
 import {
-    AddWorkflowForm,
-    AppsState,
-    ResourceOwner,
     RolesState,
     SchemasState,
     WorkflowDto,
@@ -25,56 +21,34 @@ import { SchemaTagConverter } from './schema-tag-converter';
     styleUrls: ['./workflows-page.component.scss'],
     templateUrl: './workflows-page.component.html'
 })
-export class WorkflowsPageComponent extends ResourceOwner implements OnInit {
-    public addWorkflowForm = new AddWorkflowForm(this.formBuilder);
-
+export class WorkflowsPageComponent implements OnInit, OnDestroy {
     public schemasSource: SchemaTagConverter;
 
     constructor(
-        public readonly appsState: AppsState,
         public readonly rolesState: RolesState,
         public readonly schemasState: SchemasState,
-        public readonly workflowsState: WorkflowsState,
-        private readonly formBuilder: FormBuilder
+        public readonly workflowsState: WorkflowsState
     ) {
-        super();
     }
 
     public ngOnInit() {
-        this.own(this.schemasState.changes.subscribe(s => {
-            if (s.isLoaded) {
-                this.schemasSource = new SchemaTagConverter(s.schemas.values);
-            }
-        }));
-
         this.rolesState.load();
+
+        this.schemasSource = new SchemaTagConverter(this.schemasState);
         this.schemasState.load();
-        this.workflowsState.load();
-    }
 
-    public reload() {
-        this.workflowsState.load(true);
+        this.workflowsState.load();
     }
 
-    public addWorkflow() {
-        const value = this.addWorkflowForm.submit();
-
-        if (value) {
-            this.workflowsState.add(value.name)
-                .subscribe(() => {
-                    this.addWorkflowForm.submitCompleted();
-                }, error => {
-                    this.addWorkflowForm.submitFailed(error);
-                });
-        }
+    public ngOnDestroy() {
+        this.schemasSource.destroy();
     }
 
-    public cancelAddWorkflow() {
-        this.addWorkflowForm.submitCompleted();
+    public reload() {
+        this.workflowsState.load(true);
     }
 
-    public trackByWorkflow(index: number, workflow: WorkflowDto) {
+    public trackByWorkflow(workflow: WorkflowDto) {
         return workflow.id;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/settings-area.component.html b/src/Squidex/app/features/settings/settings-area.component.html
index 1f9015836..d4c383638 100644
--- a/src/Squidex/app/features/settings/settings-area.component.html
+++ b/src/Squidex/app/features/settings/settings-area.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Settings" parameter1="app" [value1]="appsState.appDisplayName"></sqx-title>
+<sqx-title message="Settings"></sqx-title>
 
 <sqx-panel theme="dark" desiredWidth="16rem">
     <ng-container title>
@@ -8,50 +8,50 @@
     </ng-container>
     
     <ng-container content>
-        <ul class="nav nav-panel nav-dark flex-column" *ngIf="appsState.selectedValidApp | async; let selectedApp">
-            <li class="nav-item" *ngIf="selectedApp.canReadBackups">
+        <ul class="nav nav-panel nav-dark flex-column" *ngIf="appsState.selectedApp | async; let app">
+            <li class="nav-item" *ngIf="app.canReadBackups">
                 <a class="nav-link" routerLink="backups" routerLinkActive="active">
                     Backups
                     <i class="icon-angle-right"></i>
                 </a>
             </li>
-            <li class="nav-item" *ngIf="selectedApp.canReadClients">
+            <li class="nav-item" *ngIf="app.canReadClients">
                 <a class="nav-link" routerLink="clients" routerLinkActive="active">
                     Clients
                     <i class="icon-angle-right"></i>
                 </a>
             </li>
-            <li class="nav-item" *ngIf="selectedApp.canReadContributors">
+            <li class="nav-item" *ngIf="app.canReadContributors">
                 <a class="nav-link" routerLink="contributors" routerLinkActive="active">
                     Contributors
                     <i class="icon-angle-right"></i>
                 </a>
             </li>
-            <li class="nav-item" *ngIf="selectedApp.canReadRoles">
+            <li class="nav-item" *ngIf="app.canReadRoles">
                 <a class="nav-link" routerLink="roles" routerLinkActive="active">
                     Roles
                     <i class="icon-angle-right"></i>
                 </a>
             </li>
-            <li class="nav-item" *ngIf="selectedApp.canReadLanguages">
+            <li class="nav-item" *ngIf="app.canReadLanguages">
                 <a class="nav-link" routerLink="languages" routerLinkActive="active">
                     Languages
                     <i class="icon-angle-right"></i>
                 </a>
             </li>
-            <li class="nav-item" *ngIf="selectedApp.canReadPatterns">
+            <li class="nav-item" *ngIf="app.canReadPatterns">
                 <a class="nav-link" routerLink="patterns" routerLinkActive="active">
                     Patterns
                     <i class="icon-angle-right"></i>
                 </a>
             </li>
-            <li class="nav-item" *ngIf="selectedApp.canReadWorkflows">
+            <li class="nav-item" *ngIf="app.canReadWorkflows">
                 <a class="nav-link" routerLink="workflows" routerLinkActive="active">
                     Workflows
                     <i class="icon-angle-right"></i>
                 </a>
             </li>
-            <li class="nav-item" *ngIf="selectedApp.canReadPlans">
+            <li class="nav-item" *ngIf="app.canReadPlans">
                 <a class="nav-link" routerLink="plans" routerLinkActive="active">
                     Subscription
                     <i class="icon-angle-right"></i>
diff --git a/src/Squidex/app/framework/angular/forms/editable-title.component.ts b/src/Squidex/app/framework/angular/forms/editable-title.component.ts
index 2e981fb07..c8d47fbcd 100644
--- a/src/Squidex/app/framework/angular/forms/editable-title.component.ts
+++ b/src/Squidex/app/framework/angular/forms/editable-title.component.ts
@@ -16,15 +16,15 @@ const ESCAPE_KEY = 27;
     templateUrl: './editable-title.component.html'
 })
 export class EditableTitleComponent {
+    @Output()
+    public nameChanged = new EventEmitter<string>();
+
     @Input()
     public disabled = false;
 
     @Input()
     public name: string;
 
-    @Output()
-    public nameChanged = new EventEmitter<string>();
-
     public isRenaming = false;
 
     public renameForm = this.formBuilder.group({
diff --git a/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts b/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts
index 819dc6c9c..9ccd72bdf 100644
--- a/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts
+++ b/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts
@@ -24,6 +24,9 @@ interface State {
     changeDetection: ChangeDetectionStrategy.Default
 })
 export class ModalDialogComponent extends StatefulComponent<State> implements AfterViewInit {
+    @Output()
+    public close = new EventEmitter();
+
     @Input()
     public showClose = true;
 
@@ -48,9 +51,6 @@ export class ModalDialogComponent extends StatefulComponent<State> implements Af
     @Input()
     public contentClass = '';
 
-    @Output()
-    public close = new EventEmitter();
-
     @ViewChild('tabsElement', { static: false })
     public tabsElement: ElementRef<ParentNode>;
 
diff --git a/src/Squidex/app/framework/angular/modals/root-view.component.ts b/src/Squidex/app/framework/angular/modals/root-view.component.ts
index 6f306d703..511b646f6 100644
--- a/src/Squidex/app/framework/angular/modals/root-view.component.ts
+++ b/src/Squidex/app/framework/angular/modals/root-view.component.ts
@@ -12,8 +12,7 @@ import { ChangeDetectionStrategy, Component, ViewChild, ViewContainerRef } from
     template: `
         <div #element></div>
 
-        <ng-content></ng-content>
-    `,
+        <ng-content></ng-content>`,
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class RootViewComponent {
diff --git a/src/Squidex/app/framework/angular/pager.component.html b/src/Squidex/app/framework/angular/pager.component.html
index cc1ffcba4..9fd879cfa 100644
--- a/src/Squidex/app/framework/angular/pager.component.html
+++ b/src/Squidex/app/framework/angular/pager.component.html
@@ -1,4 +1,4 @@
-<div class="clearfix" *ngIf="pager && (!hideWhenButtonsDisabled || pager.canGoPrev || pager.canGoNext)">
+<div class="clearfix" *ngIf="pager && (!autoHide || pager.canGoPrev || pager.canGoNext)">
     <div class="float-right pagination">
         <span *ngIf="pager.numberOfItems > 0" class="pagination-text">{{pager.itemFirst}}-{{pager.itemLast}} of {{pager.numberOfItems}}</span>
 
diff --git a/src/Squidex/app/framework/angular/pager.component.ts b/src/Squidex/app/framework/angular/pager.component.ts
index 0be4db6ae..fbea4a691 100644
--- a/src/Squidex/app/framework/angular/pager.component.ts
+++ b/src/Squidex/app/framework/angular/pager.component.ts
@@ -26,7 +26,7 @@ export class PagerComponent {
     public pager: Pager;
 
     @Input()
-    public hideWhenButtonsDisabled = false;
+    public autoHide = false;
 
     public emitNext() {
         this.nextPage.emit();
diff --git a/src/Squidex/app/framework/angular/panel.component.html b/src/Squidex/app/framework/angular/panel.component.html
index 34a74e4b6..11dc4494d 100644
--- a/src/Squidex/app/framework/angular/panel.component.html
+++ b/src/Squidex/app/framework/angular/panel.component.html
@@ -16,9 +16,18 @@
                 </div>
             </div>
 
-            <a class="panel-close" sqxParentLink [isLazyLoaded]="isLazyLoaded" *ngIf="showClose">
-                <i class="icon-close"></i>
-            </a>
+            <ng-container  *ngIf="showClose">
+                <ng-container *ngIf="customClose; else defaultClose">
+                    <a class="panel-close" (click)="close.emit()">
+                        <i class="icon-close"></i>
+                    </a>
+                </ng-container>
+                <ng-template #defaultClose>
+                    <a class="panel-close" sqxParentLink [isLazyLoaded]="isLazyLoaded">
+                        <i class="icon-close"></i>
+                    </a>
+                </ng-template>
+            </ng-container>
 
             <div class="panel-header-row" *ngIf="showSecondHeader">
                 <ng-content select="[secondHeader]"></ng-content>
diff --git a/src/Squidex/app/framework/angular/panel.component.ts b/src/Squidex/app/framework/angular/panel.component.ts
index 1123fcc33..b4f593f49 100644
--- a/src/Squidex/app/framework/angular/panel.component.ts
+++ b/src/Squidex/app/framework/angular/panel.component.ts
@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, Renderer2, ViewChild } from '@angular/core';
 
 import { slideRightAnimation } from '@app/framework/internal';
 
@@ -23,9 +23,8 @@ import { PanelContainerDirective } from './panel-container.directive';
 export class PanelComponent implements AfterViewInit, OnDestroy, OnInit {
     private styleWidth: string;
 
-    public renderWidth = 0;
-
-    public isViewInit = false;
+    @Output()
+    public close = new EventEmitter();
 
     @Input()
     public theme = 'light';
@@ -63,12 +62,19 @@ export class PanelComponent implements AfterViewInit, OnDestroy, OnInit {
     @Input()
     public contentClass = '';
 
+    @Input()
+    public customClose = false;
+
     @Input()
     public sidebarClass = '';
 
     @ViewChild('panel', { static: false })
     public panel: ElementRef<HTMLElement>;
 
+    public renderWidth = 0;
+
+    public isViewInit = false;
+
     constructor(
         private readonly container: PanelContainerDirective,
         private readonly renderer: Renderer2
diff --git a/src/Squidex/app/framework/angular/pipes/numbers.pipes.ts b/src/Squidex/app/framework/angular/pipes/numbers.pipes.ts
index 13f7da619..420c24dec 100644
--- a/src/Squidex/app/framework/angular/pipes/numbers.pipes.ts
+++ b/src/Squidex/app/framework/angular/pipes/numbers.pipes.ts
@@ -46,5 +46,4 @@ export class FileSizePipe implements PipeTransform {
 
         return (u ? value.toFixed(1) + ' ' : value) + ' kMGTPEZY'[u] + 'B';
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/framework/angular/shortcut.component.ts b/src/Squidex/app/framework/angular/shortcut.component.ts
index d1b2b993f..6496146ba 100644
--- a/src/Squidex/app/framework/angular/shortcut.component.ts
+++ b/src/Squidex/app/framework/angular/shortcut.component.ts
@@ -16,15 +16,15 @@ import { ShortcutService, StatefulComponent } from '@app/framework/internal';
 export class ShortcutComponent extends StatefulComponent implements OnDestroy, OnInit {
     private lastKeys: string;
 
+    @Output()
+    public trigger = new EventEmitter();
+
     @Input()
     public keys: string;
 
     @Input()
     public disabled: boolean;
 
-    @Output()
-    public trigger = new EventEmitter();
-
     constructor(
         changeDetector: ChangeDetectorRef,
         private readonly shortcutService: ShortcutService,
diff --git a/src/Squidex/app/framework/angular/title.component.ts b/src/Squidex/app/framework/angular/title.component.ts
index 63510e7dc..3152eaa31 100644
--- a/src/Squidex/app/framework/angular/title.component.ts
+++ b/src/Squidex/app/framework/angular/title.component.ts
@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnDestroy } from '@angular/core';
 
 import { TitleService } from '@app/framework/internal';
 
@@ -14,46 +14,24 @@ import { TitleService } from '@app/framework/internal';
     template: '',
     changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class TitleComponent implements OnChanges {
-    @Input()
-    public message: any;
-
-    @Input()
-    public parameter1: string;
+export class TitleComponent implements OnDestroy {
+    private previous: any;
 
     @Input()
-    public parameter2: string;
+    public set message(value: any) {
+        this.titleService.push(value, this.previous);
 
-    @Input()
-    public value1: any;
-
-    @Input()
-    public value2: any;
+        this.previous = value;
+    }
 
     constructor(
         private readonly titleService: TitleService
     ) {
     }
 
-    public ngOnChanges() {
-        const parameters = {};
-
-        if (this.parameter1) {
-            if (!this.value1) {
-                return;
-            }
-
-            parameters[this.parameter1] = this.value1;
-        }
-
-        if (this.parameter2) {
-            if (!this.value2) {
-                return;
-            }
-
-            parameters[this.parameter2] = this.value2;
+    public ngOnDestroy() {
+        if (this.previous) {
+            this.titleService.pop();
         }
-
-        this.titleService.setTitle(this.message, parameters);
     }
 }
\ No newline at end of file
diff --git a/src/Squidex/app/framework/services/onboarding.service.ts b/src/Squidex/app/framework/services/onboarding.service.ts
index 506b368c2..01d00ae08 100644
--- a/src/Squidex/app/framework/services/onboarding.service.ts
+++ b/src/Squidex/app/framework/services/onboarding.service.ts
@@ -1,6 +1,3 @@
-
-
-
 /*
  * Squidex Headless CMS
  *
diff --git a/src/Squidex/app/framework/services/title.service.spec.ts b/src/Squidex/app/framework/services/title.service.spec.ts
index 6225497a6..ed7b49918 100644
--- a/src/Squidex/app/framework/services/title.service.spec.ts
+++ b/src/Squidex/app/framework/services/title.service.spec.ts
@@ -17,70 +17,82 @@ describe('TitleService', () => {
     });
 
     it('should instantiate from factory', () => {
-        const titleService = TitleServiceFactory(new TitlesConfig({}));
+        const titleService = TitleServiceFactory(new TitlesConfig());
 
         expect(titleService).toBeDefined();
     });
 
     it('should instantiate', () => {
-        const titleService = new TitleService(new TitlesConfig({}));
+        const titleService = new TitleService(new TitlesConfig());
 
         expect(titleService).toBeDefined();
     });
 
-    it('should use key when title key is not found in configuration', () => {
-        const titleService = new TitleService(new TitlesConfig({}));
+    it('should use single part when title element is pushed', () => {
+        const titleService = new TitleService(new TitlesConfig());
 
-        titleService.setTitle('my-title', {});
+        titleService.push('my-title');
 
         expect(document.title).toBe('my-title');
     });
 
-    it('should prepand prefix to title', () => {
-        const titleService = new TitleService(new TitlesConfig({}, 'myapp'));
+    it('should concatenate multiple parts when title elements are pushed', () => {
+        const titleService = new TitleService(new TitlesConfig());
 
-        titleService.setTitle('my-title', {});
+        titleService.push('my-title1');
+        titleService.push('my-title2');
 
-        expect(document.title).toBe('myapp - my-title');
+        expect(document.title).toBe('my-title1 | my-title2');
     });
 
-    it('should append suffix to title', () => {
-        const titleService = new TitleService(new TitlesConfig({}, undefined, 'myapp'));
+    it('should replace previous element when found', () => {
+        const titleService = new TitleService(new TitlesConfig());
 
-        titleService.setTitle('my-title', {});
+        titleService.push('my-title1');
+        titleService.push('my-title2');
+        titleService.push('my-title3', 'my-title2');
 
-        expect(document.title).toBe('my-title - myapp');
+        expect(document.title).toBe('my-title1 | my-title3');
     });
 
-    it('should do nothing if title is null', () => {
-        const titleService = new TitleService(new TitlesConfig({}, undefined, 'myapp'));
+    it('should concatenate remainging parts when title elements are popped', () => {
+        const titleService = new TitleService(new TitlesConfig());
 
-        titleService.setTitle(null!, {});
+        titleService.push('my-title1');
+        titleService.pop();
 
         expect(document.title).toBe('');
     });
 
-    it('should set document title when title key is found in configuration', () => {
-        const titles: { [key: string]: string } = {
-            found: 'found-title'
-        };
+    it('should prepand prefix to title', () => {
+        const titleService = new TitleService(new TitlesConfig('prefix'));
+
+        titleService.push('my-title');
+
+        expect(document.title).toBe('prefix - my-title');
+    });
 
-        const titleService = new TitleService(new TitlesConfig(titles));
+    it('should append suffix to title', () => {
+        const titleService = new TitleService(new TitlesConfig( undefined, 'suffix'));
 
-        titleService.setTitle('found', {});
+        titleService.push('my-title');
 
-        expect(document.title).toBe('found-title');
+        expect(document.title).toBe('my-title - suffix');
     });
 
-    it('should set document title to formatted string when title key found in configuration', () => {
-        const titles: { [key: string]: string } = {
-            found: 'my {value} in title'
-        };
+    it('should use suffix when stack is empty', () => {
+        const titleService = new TitleService(new TitlesConfig('prefix', 'suffix'));
+
+        titleService.pop();
+
+        expect(document.title).toBe('suffix');
+    });
 
-        const titleService = new TitleService(new TitlesConfig(titles));
+    it('should use suffix when stack is empty and no suffix is set', () => {
+        const titleService = new TitleService(new TitlesConfig('prefix'));
 
-        titleService.setTitle('found', { value: 'secret' });
+        titleService.pop();
 
-        expect(document.title).toBe('my secret in title');
+        expect(document.title).toBe('prefix');
     });
 });
diff --git a/src/Squidex/app/framework/services/title.service.ts b/src/Squidex/app/framework/services/title.service.ts
index 7fa7e7f49..2555a23e9 100644
--- a/src/Squidex/app/framework/services/title.service.ts
+++ b/src/Squidex/app/framework/services/title.service.ts
@@ -9,9 +9,9 @@ import { Injectable } from '@angular/core';
 
 export class TitlesConfig {
     constructor(
-        public readonly value: { [key: string]: string },
         public readonly prefix?: string,
-        public readonly suffix?: string
+        public readonly suffix?: string,
+        public readonly separator?: string
     ) {
     }
 }
@@ -22,31 +22,56 @@ export const TitleServiceFactory = (titles: TitlesConfig) => {
 
 @Injectable()
 export class TitleService {
-    constructor(private readonly titles: TitlesConfig) {}
+    private readonly stack: any[] = [];
 
-    public setTitle(key: string, parameters?: { [key: string]: string }) {
-        let title = this.titles.value[key] || key;
+    constructor(private readonly titles: TitlesConfig) {
+        this.updateTitle();
+    }
 
-        if (!title) {
-            return;
-        }
+    public push(value: any, previous?: any) {
+        if (value) {
+            const lastIndex = this.stack.length - 1;
 
-        if (parameters) {
-            for (let parameter in parameters) {
-                if (parameters.hasOwnProperty(parameter)) {
-                    title = title.replace(`{${parameter}}`, parameters[parameter]);
-                }
+            if (previous && this.stack[lastIndex] === previous) {
+                this.stack[lastIndex] = value;
+            } else {
+                this.stack.push(value);
             }
+
+            this.updateTitle();
         }
+    }
+
+    public pop() {
+        this.stack.pop();
+
+        this.updateTitle();
+    }
 
-        if (this.titles.prefix) {
-            title = this.titles.prefix + ' - ' + title;
+    private updateTitle() {
+        const { prefix, separator, suffix } = this.titles;
+
+        let title = '';
+
+        if (this.stack.length > 0) {
+            title = this.stack.join(separator || ' | ');
         }
 
-        if (this.titles.suffix) {
-            title = title + ' - ' + this.titles.suffix;
+        if (title) {
+            if (prefix) {
+                title = `${prefix} - ${title}`;
+            }
+
+            if (suffix) {
+                title = `${title} - ${suffix}`;
+            }
+        } else if (suffix) {
+            title = suffix;
+        } else if (prefix) {
+            title = prefix;
         }
 
         document.title = title;
+
     }
 }
\ No newline at end of file
diff --git a/src/Squidex/app/framework/utils/error.ts b/src/Squidex/app/framework/utils/error.ts
index afaf9bc64..b80637772 100644
--- a/src/Squidex/app/framework/utils/error.ts
+++ b/src/Squidex/app/framework/utils/error.ts
@@ -34,7 +34,6 @@ export function getDisplayMessage(error?: string | ErrorDto) {
     }
 }
 
-
 function formatMessage(message: string, details?: string[]) {
     const appendLast = (row: string, char: string) => {
         const last = row[row.length - 1];
diff --git a/src/Squidex/app/framework/utils/immutable-array.spec.ts b/src/Squidex/app/framework/utils/immutable-array.spec.ts
index 0a047ab42..8be569a02 100644
--- a/src/Squidex/app/framework/utils/immutable-array.spec.ts
+++ b/src/Squidex/app/framework/utils/immutable-array.spec.ts
@@ -212,5 +212,4 @@ describe('ImmutableArray', () => {
 
         expect(values).toEqual([3, 1, 4, 2]);
     });
-});
-
+});
\ No newline at end of file
diff --git a/src/Squidex/app/framework/utils/modal-view.spec.ts b/src/Squidex/app/framework/utils/modal-view.spec.ts
index 6f19b71a3..46780c39c 100644
--- a/src/Squidex/app/framework/utils/modal-view.spec.ts
+++ b/src/Squidex/app/framework/utils/modal-view.spec.ts
@@ -115,5 +115,4 @@ function checkValue(modal: Openable, expected: boolean) {
     }).unsubscribe();
 
     expect(result!).toBe(expected);
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/framework/utils/rxjs-extensions.ts b/src/Squidex/app/framework/utils/rxjs-extensions.ts
index e52173a9d..38b02d250 100644
--- a/src/Squidex/app/framework/utils/rxjs-extensions.ts
+++ b/src/Squidex/app/framework/utils/rxjs-extensions.ts
@@ -8,7 +8,7 @@
 // tslint:disable: only-arrow-functions
 
 import { empty, Observable } from 'rxjs';
-import { catchError, map, onErrorResumeNext, publishReplay, refCount, switchMap } from 'rxjs/operators';
+import { catchError, distinctUntilChanged, filter, map, onErrorResumeNext, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
 import { DialogService } from './../services/dialog.service';
 
@@ -50,6 +50,12 @@ export function shareMapSubscribed<T, R = T>(dialogs: DialogService, project: (v
     };
 }
 
+export function defined<T>() {
+    return function mapOperation(source: Observable<T | undefined | null>): Observable<T> {
+        return source.pipe(filter(x => !!x), map(x => x!), distinctUntilChanged());
+    };
+}
+
 export function switchSafe<T, R>(project: (source: T) => Observable<R>) {
     return function mapOperation(source: Observable<T>) {
         return source.pipe(switchMap(project), onErrorResumeNext<R, R>());
diff --git a/src/Squidex/app/shared/components/asset-dialog.component.ts b/src/Squidex/app/shared/components/asset-dialog.component.ts
index 564b35b52..13de89d2c 100644
--- a/src/Squidex/app/shared/components/asset-dialog.component.ts
+++ b/src/Squidex/app/shared/components/asset-dialog.component.ts
@@ -23,18 +23,18 @@ import {
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class AssetDialogComponent extends StatefulComponent implements OnInit {
-    @Input()
-    public asset: AssetDto;
-
-    @Input()
-    public allTags: string[];
-
     @Output()
     public cancel = new EventEmitter();
 
     @Output()
     public complete = new EventEmitter<AssetDto>();
 
+    @Input()
+    public asset: AssetDto;
+
+    @Input()
+    public allTags: string[];
+
     public isEditable = false;
 
     public annotateForm = new AnnotateAssetForm(this.formBuilder);
diff --git a/src/Squidex/app/shared/components/asset-uploader.component.html b/src/Squidex/app/shared/components/asset-uploader.component.html
index 6c4dab19d..d0d00899d 100644
--- a/src/Squidex/app/shared/components/asset-uploader.component.html
+++ b/src/Squidex/app/shared/components/asset-uploader.component.html
@@ -1,5 +1,5 @@
-<ng-container *ngIf="appsState.selectedValidApp | async; let selectedApp">
-    <ng-container *ngIf="selectedApp.canUploadAssets">
+<ng-container *ngIf="appsState.selectedAppOrNull | async; let app">
+    <ng-container *ngIf="app.canUploadAssets">
         <ul class="nav navbar-nav" *ngIf="assetUploader.uploads | async; let uploads" (sqxDropFile)="addFiles($event)">
             <li class="nav-item dropdown">
                 <span class="nav-link dropdown-toggle" (click)="modalMenu.toggle()">
diff --git a/src/Squidex/app/shared/components/asset-uploader.component.ts b/src/Squidex/app/shared/components/asset-uploader.component.ts
index 7160ba9e0..dc2f2f6b1 100644
--- a/src/Squidex/app/shared/components/asset-uploader.component.ts
+++ b/src/Squidex/app/shared/components/asset-uploader.component.ts
@@ -8,13 +8,13 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 
 import {
-    AppsState,
     AssetsState,
     AssetUploaderState,
     DialogModel,
     fadeAnimation,
     Upload
 } from '@app/shared/internal';
+import { AppsState } from '../state/apps.state';
 
 @Component({
     selector: 'sqx-asset-uploader',
diff --git a/src/Squidex/app/shared/components/asset.component.ts b/src/Squidex/app/shared/components/asset.component.ts
index c3911f329..e0fd1ae72 100644
--- a/src/Squidex/app/shared/components/asset.component.ts
+++ b/src/Squidex/app/shared/components/asset.component.ts
@@ -32,6 +32,24 @@ interface State {
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class AssetComponent extends StatefulComponent<State> implements OnInit {
+    @Output()
+    public load = new EventEmitter<AssetDto>();
+
+    @Output()
+    public loadError = new EventEmitter();
+
+    @Output()
+    public remove = new EventEmitter();
+
+    @Output()
+    public update = new EventEmitter();
+
+    @Output()
+    public delete = new EventEmitter();
+
+    @Output()
+    public select = new EventEmitter();
+
     @Input()
     public initFile: File;
 
@@ -59,24 +77,6 @@ export class AssetComponent extends StatefulComponent<State> implements OnInit {
     @Input()
     public allTags: string[];
 
-    @Output()
-    public load = new EventEmitter<AssetDto>();
-
-    @Output()
-    public loadError = new EventEmitter();
-
-    @Output()
-    public remove = new EventEmitter<AssetDto>();
-
-    @Output()
-    public update = new EventEmitter<AssetDto>();
-
-    @Output()
-    public delete = new EventEmitter<AssetDto>();
-
-    @Output()
-    public select = new EventEmitter<AssetDto>();
-
     public editDialog = new DialogModel();
 
     constructor(changeDetector: ChangeDetectorRef,
@@ -159,11 +159,11 @@ export class AssetComponent extends StatefulComponent<State> implements OnInit {
     }
 
     public emitUpdate() {
-        this.update.emit(this.asset);
+        this.update.emit();
     }
 
     public emitRemove() {
-        this.remove.emit(this.asset);
+        this.remove.emit();
     }
 
     private setProgress(progress: number) {
diff --git a/src/Squidex/app/shared/components/assets-list.component.html b/src/Squidex/app/shared/components/assets-list.component.html
index c4971aabe..c59d20174 100644
--- a/src/Squidex/app/shared/components/assets-list.component.html
+++ b/src/Squidex/app/shared/components/assets-list.component.html
@@ -28,11 +28,11 @@
             [isSelectable]="selectedIds"
             [isSelected]="isSelected(asset)"
             [allTags]="tags"
-            (update)="update($event)"
-            (select)="emitSelect($event)"
-            (delete)="delete($event)">
+            (update)="update(asset)"
+            (select)="emitSelect(asset)"
+            (delete)="delete(asset)">
         </sqx-asset>
     </ng-container>
 </div>
 
-<sqx-pager [hideWhenButtonsDisabled]="true" [pager]="state.assetsPager | async" (prevPage)="goPrev()" (nextPage)="goNext()"></sqx-pager>
\ No newline at end of file
+<sqx-pager [autoHide]="true" [pager]="state.assetsPager | async" (prevPage)="goPrev()" (nextPage)="goNext()"></sqx-pager>
\ No newline at end of file
diff --git a/src/Squidex/app/shared/components/assets-list.component.ts b/src/Squidex/app/shared/components/assets-list.component.ts
index a2d10af80..5fd8dda9a 100644
--- a/src/Squidex/app/shared/components/assets-list.component.ts
+++ b/src/Squidex/app/shared/components/assets-list.component.ts
@@ -21,7 +21,8 @@ import {
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class AssetsListComponent {
-    public newFiles = ImmutableArray.empty<File>();
+    @Output()
+    public select = new EventEmitter<AssetDto>();
 
     @Input()
     public state: AssetsState;
@@ -35,8 +36,7 @@ export class AssetsListComponent {
     @Input()
     public selectedIds: object;
 
-    @Output()
-    public select = new EventEmitter<AssetDto>();
+    public newFiles = ImmutableArray.empty<File>();
 
     constructor(
         private readonly changeDetector: ChangeDetectorRef
diff --git a/src/Squidex/app/shared/components/assets-selector.component.ts b/src/Squidex/app/shared/components/assets-selector.component.ts
index 98abf1155..8352fabaa 100644
--- a/src/Squidex/app/shared/components/assets-selector.component.ts
+++ b/src/Squidex/app/shared/components/assets-selector.component.ts
@@ -92,5 +92,4 @@ export class AssetsSelectorComponent extends StatefulComponent<State> implements
 
         this.localStore.setBoolean('squidex.assets.list-view', isListView);
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/shared/components/comment.component.ts b/src/Squidex/app/shared/components/comment.component.ts
index ca2a75db3..7ac1a7db1 100644
--- a/src/Squidex/app/shared/components/comment.component.ts
+++ b/src/Squidex/app/shared/components/comment.component.ts
@@ -17,7 +17,11 @@ import { CommentDto, UpsertCommentForm } from '@app/shared/internal';
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class CommentComponent {
-    public editForm = new UpsertCommentForm(this.formBuilder);
+    @Output()
+    public delete = new EventEmitter();
+
+    @Output()
+    public update = new EventEmitter<string>();
 
     @Input()
     public comment: CommentDto;
@@ -25,11 +29,7 @@ export class CommentComponent {
     @Input()
     public userId: string;
 
-    @Output()
-    public delete = new EventEmitter();
-
-    @Output()
-    public update = new EventEmitter<string>();
+    public editForm = new UpsertCommentForm(this.formBuilder);
 
     constructor(
         private readonly formBuilder: FormBuilder
diff --git a/src/Squidex/app/shared/components/language-selector.component.ts b/src/Squidex/app/shared/components/language-selector.component.ts
index ec5a2b703..01beec10e 100644
--- a/src/Squidex/app/shared/components/language-selector.component.ts
+++ b/src/Squidex/app/shared/components/language-selector.component.ts
@@ -22,7 +22,8 @@ export interface Language { iso2Code: string; englishName: string; isMasterLangu
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class LanguageSelectorComponent implements OnChanges, OnInit {
-    public dropdown = new ModalModel();
+    @Output()
+    public selectedLanguageChange = new EventEmitter<Language>();
 
     @Input()
     public size: string;
@@ -33,8 +34,7 @@ export class LanguageSelectorComponent implements OnChanges, OnInit {
     @Input()
     public selectedLanguage: Language;
 
-    @Output()
-    public selectedLanguageChange = new EventEmitter<Language>();
+    public dropdown = new ModalModel();
 
     public get isSmallMode(): boolean {
         return this.languages && this.languages.length > 0 && this.languages.length <= 3;
diff --git a/src/Squidex/app/shared/components/queries/filter-comparison.component.ts b/src/Squidex/app/shared/components/queries/filter-comparison.component.ts
index f994914e8..ca18b65e5 100644
--- a/src/Squidex/app/shared/components/queries/filter-comparison.component.ts
+++ b/src/Squidex/app/shared/components/queries/filter-comparison.component.ts
@@ -25,10 +25,6 @@ import { StatusInfo } from '@app/shared/services/contents.service';
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FilterComparisonComponent implements OnChanges {
-    public fieldModel: QueryFieldModel;
-
-    public noValue = false;
-
     @Output()
     public change = new EventEmitter();
 
@@ -41,6 +37,10 @@ export class FilterComparisonComponent implements OnChanges {
     @Input()
     public filter: FilterComparison;
 
+    public fieldModel: QueryFieldModel;
+
+    public noValue = false;
+
     public ngOnChanges(changes: SimpleChanges) {
         if (changes['filter']) {
             this.updatePath(false);
diff --git a/src/Squidex/app/shared/components/queries/filter-logical.component.ts b/src/Squidex/app/shared/components/queries/filter-logical.component.ts
index 969f1c7a6..40c494749 100644
--- a/src/Squidex/app/shared/components/queries/filter-logical.component.ts
+++ b/src/Squidex/app/shared/components/queries/filter-logical.component.ts
@@ -26,8 +26,6 @@ import {
 export class FilterLogicalComponent {
     private filterValue: FilterLogical;
 
-    public filters: FilterNode[] = [];
-
     @Output()
     public change = new EventEmitter();
 
@@ -54,6 +52,8 @@ export class FilterLogicalComponent {
         return this.filterValue;
     }
 
+    public filters: FilterNode[] = [];
+
     public addComparison() {
         this.filters.push(<any>{ path: Object.keys(this.model.fields)[0] });
 
diff --git a/src/Squidex/app/shared/components/queries/filter-node.component.ts b/src/Squidex/app/shared/components/queries/filter-node.component.ts
index 336de86b6..e93e2aea8 100644
--- a/src/Squidex/app/shared/components/queries/filter-node.component.ts
+++ b/src/Squidex/app/shared/components/queries/filter-node.component.ts
@@ -27,15 +27,12 @@ import {
             <sqx-filter-comparison [model]="model" [filter]="comparison"
                 (remove)="remove.emit()" (change)="change.emit()">
             </sqx-filter-comparison>
-        </ng-container>
-    `,
+        </ng-container>`,
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FilterNodeComponent {
     public comparison: FilterComparison;
 
-    public logical: FilterLogical;
-
     @Output()
     public change = new EventEmitter();
 
@@ -56,4 +53,6 @@ export class FilterNodeComponent {
             this.comparison = <FilterComparison>value;
         }
     }
+
+    public logical: FilterLogical;
 }
\ No newline at end of file
diff --git a/src/Squidex/app/shared/components/queries/query.component.ts b/src/Squidex/app/shared/components/queries/query.component.ts
index 5903edcb4..dd87a00e3 100644
--- a/src/Squidex/app/shared/components/queries/query.component.ts
+++ b/src/Squidex/app/shared/components/queries/query.component.ts
@@ -27,13 +27,10 @@ import {
             <button class="btn btn-outline-success btn-sm mr-2" (click)="addSorting()">
                 Add Sorting
             </button>
-        </div>
-    `,
+        </div>`,
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class QueryComponent {
-    public queryValue: Query;
-
     @Output()
     public queryChange = new EventEmitter<Query>();
 
@@ -61,6 +58,8 @@ export class QueryComponent {
         }
     }
 
+    public queryValue: Query;
+
     constructor() {
         this.query = {};
     }
diff --git a/src/Squidex/app/shared/components/queries/sorting.component.ts b/src/Squidex/app/shared/components/queries/sorting.component.ts
index 96f9f51f9..6422ae3b0 100644
--- a/src/Squidex/app/shared/components/queries/sorting.component.ts
+++ b/src/Squidex/app/shared/components/queries/sorting.component.ts
@@ -30,8 +30,7 @@ import { QueryModel, QuerySorting } from '@app/shared/internal';
                     <i class="icon-bin2"></i>
                 </button>
             </div>
-        </div>
-     `,
+        </div>`,
      changeDetection: ChangeDetectionStrategy.OnPush
  })
 export class SortingComponent {
diff --git a/src/Squidex/app/shared/components/rich-editor.component.ts b/src/Squidex/app/shared/components/rich-editor.component.ts
index 4e73c1c65..a033e3f26 100644
--- a/src/Squidex/app/shared/components/rich-editor.component.ts
+++ b/src/Squidex/app/shared/components/rich-editor.component.ts
@@ -47,12 +47,12 @@ export class RichEditorComponent extends StatefulControlComponent<undefined, str
     private value: string;
     private isDisabled = false;
 
-    @ViewChild('editor', { static: false })
-    public editor: ElementRef;
-
     @Output()
     public assetPluginClick = new EventEmitter<any>();
 
+    @ViewChild('editor', { static: false })
+    public editor: ElementRef;
+
     public assetsDialog = new DialogModel();
 
     constructor(changeDetector: ChangeDetectorRef,
diff --git a/src/Squidex/app/shared/components/saved-queries.component.ts b/src/Squidex/app/shared/components/saved-queries.component.ts
index d9d09a296..6cd245aba 100644
--- a/src/Squidex/app/shared/components/saved-queries.component.ts
+++ b/src/Squidex/app/shared/components/saved-queries.component.ts
@@ -65,6 +65,9 @@ import { SavedQuery } from '../state/queries';
     `
 })
 export class SavedQueriesComponent {
+    @Output()
+    public search = new EventEmitter<SavedQuery>();
+
     @Input()
     public queryUsed: (saved: SavedQuery) => boolean;
 
@@ -74,9 +77,6 @@ export class SavedQueriesComponent {
     @Input()
     public types: string;
 
-    @Output()
-    public search = new EventEmitter<SavedQuery>();
-
     public isSelectedQuery(saved: SavedQuery) {
         return this.queryUsed && this.queryUsed(saved);
     }
diff --git a/src/Squidex/app/shared/components/schema-category.component.ts b/src/Squidex/app/shared/components/schema-category.component.ts
index c109f81ea..e0fd7b5fe 100644
--- a/src/Squidex/app/shared/components/schema-category.component.ts
+++ b/src/Squidex/app/shared/components/schema-category.component.ts
@@ -36,6 +36,9 @@ interface State {
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SchemaCategoryComponent extends StatefulComponent<State> implements OnInit, OnChanges {
+    @Output()
+    public remove = new EventEmitter();
+
     @Input()
     public schemaCategory: SchemaCategory;
 
@@ -45,9 +48,6 @@ export class SchemaCategoryComponent extends StatefulComponent<State> implements
     @Input()
     public forContent: boolean;
 
-    @Output()
-    public remove = new EventEmitter();
-
     public allowDrop = (schema: any) => {
         return (Types.is(schema, SchemaDto) || Types.is(schema, SchemaDetailsDto)) && !isSameCategory(this.schemaCategory.name, schema);
     }
diff --git a/src/Squidex/app/shared/components/search-form.component.ts b/src/Squidex/app/shared/components/search-form.component.ts
index 5089dce47..9c03052ab 100644
--- a/src/Squidex/app/shared/components/search-form.component.ts
+++ b/src/Squidex/app/shared/components/search-form.component.ts
@@ -31,6 +31,9 @@ import {
 export class SearchFormComponent implements OnChanges {
     public readonly standalone = { standalone: true };
 
+    @Output()
+    public queryChange = new EventEmitter<Query>();
+
     @Input()
     public placeholder = '';
 
@@ -40,9 +43,6 @@ export class SearchFormComponent implements OnChanges {
     @Input()
     public query: Query;
 
-    @Output()
-    public queryChange = new EventEmitter<Query>();
-
     @Input()
     public queries: Queries;
 
diff --git a/src/Squidex/app/shared/components/table-header.component.ts b/src/Squidex/app/shared/components/table-header.component.ts
index ac1bcdfb9..615cac079 100644
--- a/src/Squidex/app/shared/components/table-header.component.ts
+++ b/src/Squidex/app/shared/components/table-header.component.ts
@@ -35,6 +35,9 @@ type Field = string | RootFieldDto;
 export class TableHeaderComponent implements OnChanges {
     private fieldPath: string;
 
+    @Output()
+    public queryChange = new EventEmitter<Query>();
+
     @Input()
     public text: string;
 
@@ -50,9 +53,6 @@ export class TableHeaderComponent implements OnChanges {
     @Input()
     public query: Query;
 
-    @Output()
-    public queryChange = new EventEmitter<Query>();
-
     public order: SortMode | null;
 
     public ngOnChanges(changes: SimpleChanges) {
diff --git a/src/Squidex/app/shared/guards/app-must-exist.guard.ts b/src/Squidex/app/shared/guards/app-must-exist.guard.ts
index 156845fbe..fa3c7c01e 100644
--- a/src/Squidex/app/shared/guards/app-must-exist.guard.ts
+++ b/src/Squidex/app/shared/guards/app-must-exist.guard.ts
@@ -25,12 +25,12 @@ export class AppMustExistGuard implements CanActivate {
 
         const result =
             this.appsState.select(appName).pipe(
-                tap(dto => {
-                    if (!dto) {
+                tap(app => {
+                    if (!app) {
                         this.router.navigate(['/404']);
                     }
                 }),
-                map(a => !!a));
+                map(app => !!app));
 
         return result;
     }
diff --git a/src/Squidex/app/shared/guards/content-must-exist.guard.ts b/src/Squidex/app/shared/guards/content-must-exist.guard.ts
index c295fdfa0..0b8daac42 100644
--- a/src/Squidex/app/shared/guards/content-must-exist.guard.ts
+++ b/src/Squidex/app/shared/guards/content-must-exist.guard.ts
@@ -27,12 +27,12 @@ export class ContentMustExistGuard implements CanActivate {
 
         const result =
             this.contentsState.select(contentId).pipe(
-                tap(dto => {
-                    if (!dto) {
+                tap(content => {
+                    if (!content) {
                         this.router.navigate(['/404']);
                     }
                 }),
-                map(u => !!u));
+                map(content => !!content));
 
         return result;
     }
diff --git a/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts b/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts
index 81e3c48a6..02e54b522 100644
--- a/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts
+++ b/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts
@@ -27,12 +27,12 @@ export class SchemaMustExistPublishedGuard implements CanActivate {
 
         const result =
             this.schemasState.select(schemaName).pipe(
-                tap(dto => {
-                    if (!dto || !dto.isPublished) {
+                tap(schema => {
+                    if (!schema || !schema.isPublished) {
                         this.router.navigate(['/404']);
                     }
                 }),
-                map(s => !!s && s.isPublished));
+                map(schema => !!schema && schema.isPublished));
 
         return result;
     }
diff --git a/src/Squidex/app/shared/guards/schema-must-exist.guard.ts b/src/Squidex/app/shared/guards/schema-must-exist.guard.ts
index 8e12f86db..1cde279fe 100644
--- a/src/Squidex/app/shared/guards/schema-must-exist.guard.ts
+++ b/src/Squidex/app/shared/guards/schema-must-exist.guard.ts
@@ -27,12 +27,12 @@ export class SchemaMustExistGuard implements CanActivate {
 
         const result =
             this.schemasState.select(schemaName).pipe(
-                tap(dto => {
-                    if (!dto) {
+                tap(schema => {
+                    if (!schema) {
                         this.router.navigate(['/404']);
                     }
                 }),
-                map(s => !!s));
+                map(schema => !!schema));
 
         return result;
     }
diff --git a/src/Squidex/app/shared/guards/schema-must-not-be-singleton.guard.spec.ts b/src/Squidex/app/shared/guards/schema-must-not-be-singleton.guard.spec.ts
index ccc3b32ec..2d02ec25a 100644
--- a/src/Squidex/app/shared/guards/schema-must-not-be-singleton.guard.spec.ts
+++ b/src/Squidex/app/shared/guards/schema-must-not-be-singleton.guard.spec.ts
@@ -51,23 +51,6 @@ describe('SchemaMustNotBeSingletonGuard', () => {
         router.verify(x => x.navigate(It.isAny()), Times.never());
     });
 
-    it('should subscribe to schema and return false when not found', () => {
-        const state: RouterStateSnapshot = <any>{ url: 'schemas/name/' };
-
-        schemasState.setup(x => x.selectedSchema)
-            .returns(() => of(undefined));
-
-        let result: boolean;
-
-        schemaGuard.canActivate(route, state).subscribe(x => {
-            result = x;
-        }).unsubscribe();
-
-        expect(result!).toBeFalsy();
-
-        router.verify(x => x.navigate(It.isAny()), Times.never());
-    });
-
     it('should redirect to content when singleton', () => {
         const state: RouterStateSnapshot = <any>{ url: 'schemas/name/' };
 
diff --git a/src/Squidex/app/shared/guards/schema-must-not-be-singleton.guard.ts b/src/Squidex/app/shared/guards/schema-must-not-be-singleton.guard.ts
index 73624cd09..51a955b4d 100644
--- a/src/Squidex/app/shared/guards/schema-must-not-be-singleton.guard.ts
+++ b/src/Squidex/app/shared/guards/schema-must-not-be-singleton.guard.ts
@@ -24,18 +24,18 @@ export class SchemaMustNotBeSingletonGuard implements CanActivate {
         const result =
             this.schemasState.selectedSchema.pipe(
                 take(1),
-                tap(dto => {
-                    if (dto && dto.isSingleton) {
+                tap(schema => {
+                    if (schema.isSingleton) {
                         if (state.url.indexOf('/new') >= 0) {
                             const parentUrl = state.url.slice(0, state.url.indexOf(route.url[route.url.length - 1].path));
 
-                            this.router.navigate([parentUrl, dto.id]);
+                            this.router.navigate([parentUrl, schema.id]);
                         } else {
-                            this.router.navigate([state.url, dto.id]);
+                            this.router.navigate([state.url, schema.id]);
                         }
                     }
                 }),
-                map(s => !!s && !s.isSingleton));
+                map(schema => !schema.isSingleton));
 
         return result;
     }
diff --git a/src/Squidex/app/shared/services/backups.service.spec.ts b/src/Squidex/app/shared/services/backups.service.spec.ts
index 9713a023a..68631ccb9 100644
--- a/src/Squidex/app/shared/services/backups.service.spec.ts
+++ b/src/Squidex/app/shared/services/backups.service.spec.ts
@@ -60,10 +60,10 @@ describe('BackupsService', () => {
         });
 
         expect(backups!).toEqual(
-            new BackupsDto([
+            new BackupsDto(2, [
                 createBackup(12),
                 createBackup(13)
-            ]));
+            ], {}));
     }));
 
     it('should make get request to get restore',
diff --git a/src/Squidex/app/shared/services/backups.service.ts b/src/Squidex/app/shared/services/backups.service.ts
index 9ecf9a270..e68b0158c 100644
--- a/src/Squidex/app/shared/services/backups.service.ts
+++ b/src/Squidex/app/shared/services/backups.service.ts
@@ -23,14 +23,6 @@ import {
 } from '@app/framework';
 
 export class BackupsDto extends ResultSet<BackupDto> {
-    public readonly _links: ResourceLinks;
-
-    constructor(items: BackupDto[], links?: {}) {
-        super(items.length, items);
-
-        this._links = links || {};
-    }
-
     public get canCreate() {
         return hasAnyLink(this._links, 'create');
     }
@@ -43,6 +35,10 @@ export class BackupDto {
 
     public readonly downloadUrl: string;
 
+    public get isFailed() {
+        return this.status === 'Failed';
+    }
+
     constructor(
         links: ResourceLinks,
         public readonly id: string,
@@ -92,7 +88,7 @@ export class BackupsService {
             map(({ items, _links }) => {
                 const backups = items.map(item => parseBackup(item));
 
-                return new BackupsDto(backups, _links);
+                return new BackupsDto(backups.length, backups, _links);
             }),
             pretifyError('Failed to load backups.'));
     }
diff --git a/src/Squidex/app/shared/services/rules.service.spec.ts b/src/Squidex/app/shared/services/rules.service.spec.ts
index b98b61428..4f0815d17 100644
--- a/src/Squidex/app/shared/services/rules.service.spec.ts
+++ b/src/Squidex/app/shared/services/rules.service.spec.ts
@@ -5,7 +5,6 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 
diff --git a/src/Squidex/app/shared/services/rules.service.ts b/src/Squidex/app/shared/services/rules.service.ts
index b4f6c8350..eaaf824f9 100644
--- a/src/Squidex/app/shared/services/rules.service.ts
+++ b/src/Squidex/app/shared/services/rules.service.ts
@@ -24,7 +24,16 @@ import {
     Version
 } from '@app/framework';
 
-export const ALL_TRIGGERS = {
+export type TriggerDto = {
+    description: string;
+    display: string;
+    iconColor: string;
+    iconCode: string;
+};
+
+export type TriggersDto = { [key: string]: TriggerDto };
+
+export const ALL_TRIGGERS: TriggersDto = {
     'ContentChanged': {
         description: 'For content changes like created, updated, published, unpublished...',
         display: 'Content changed',
@@ -51,6 +60,8 @@ export const ALL_TRIGGERS = {
     }
 };
 
+export type ActionsDto = { [name: string]: RuleElementDto };
+
 export class RuleElementDto {
     constructor(
         public readonly display: string,
diff --git a/src/Squidex/app/shared/state/_test-helpers.ts b/src/Squidex/app/shared/state/_test-helpers.ts
index 16ead2cef..130b18a72 100644
--- a/src/Squidex/app/shared/state/_test-helpers.ts
+++ b/src/Squidex/app/shared/state/_test-helpers.ts
@@ -28,10 +28,10 @@ const appsState = Mock.ofType<AppsState>();
 appsState.setup(x => x.appName)
     .returns(() => app);
 
-appsState.setup(x => x.selectedApp)
+appsState.setup(x => x.selectedAppOrNull)
     .returns(() => of(<any>{ name: app }));
 
-appsState.setup(x => x.selectedValidApp)
+appsState.setup(x => x.selectedApp)
     .returns(() => of(<any>{ name: app }));
 
 const authService = Mock.ofType<AuthService>();
diff --git a/src/Squidex/app/shared/state/apps.state.ts b/src/Squidex/app/shared/state/apps.state.ts
index 587ae423a..194a4aca5 100644
--- a/src/Squidex/app/shared/state/apps.state.ts
+++ b/src/Squidex/app/shared/state/apps.state.ts
@@ -7,9 +7,10 @@
 
 import { Injectable } from '@angular/core';
 import { Observable, of } from 'rxjs';
-import { distinctUntilChanged, filter, map, tap } from 'rxjs/operators';
+import { tap } from 'rxjs/operators';
 
 import {
+    defined,
     DialogService,
     ImmutableArray,
     shareSubscribed,
@@ -45,12 +46,11 @@ export class AppsState extends State<Snapshot> {
     public apps =
         this.project(s => s.apps);
 
-    public selectedApp =
+    public selectedAppOrNull =
         this.project(s => s.selectedApp);
 
-    public selectedValidApp =
-        this.selectedApp.pipe(filter(x => !!x), map(x => <AppDto>x),
-            distinctUntilChanged());
+    public selectedApp =
+        this.selectedAppOrNull.pipe(defined());
 
     constructor(
         private readonly appsService: AppsService,
@@ -142,10 +142,12 @@ export class AppsState extends State<Snapshot> {
     private replaceApp(updated: AppDto, app: AppDto) {
         this.next(s => {
             const apps = s.apps.replaceBy('id', updated);
+
             const selectedApp = s.selectedApp &&
                 s.selectedApp.id === app.id ?
                 updated :
                 s.selectedApp;
+
             return { ...s, apps, selectedApp };
         });
     }
diff --git a/src/Squidex/app/shared/state/backups.state.spec.ts b/src/Squidex/app/shared/state/backups.state.spec.ts
index 22d5bb952..2395b5f1f 100644
--- a/src/Squidex/app/shared/state/backups.state.spec.ts
+++ b/src/Squidex/app/shared/state/backups.state.spec.ts
@@ -47,7 +47,7 @@ describe('BackupsState', () => {
     describe('Loading', () => {
         it('should load backups', () => {
             backupsService.setup(x => x.getBackups(app))
-                .returns(() => of(new BackupsDto([backup1, backup2]))).verifiable();
+                .returns(() => of(new BackupsDto(2, [backup1, backup2], {}))).verifiable();
 
             backupsState.load().subscribe();
 
@@ -59,7 +59,7 @@ describe('BackupsState', () => {
 
         it('should show notification on load when reload is true', () => {
             backupsService.setup(x => x.getBackups(app))
-                .returns(() => of(new BackupsDto([backup1, backup2]))).verifiable();
+                .returns(() => of(new BackupsDto(2, [backup1, backup2], {}))).verifiable();
 
             backupsState.load(true, false).subscribe();
 
@@ -94,7 +94,7 @@ describe('BackupsState', () => {
     describe('Updates', () => {
         beforeEach(() => {
             backupsService.setup(x => x.getBackups(app))
-                .returns(() => of(new BackupsDto([backup1, backup2]))).verifiable();
+                .returns(() => of(new BackupsDto(2, [backup1, backup2], {}))).verifiable();
 
             backupsState.load().subscribe();
         });
diff --git a/src/Squidex/app/shared/state/plans.state.ts b/src/Squidex/app/shared/state/plans.state.ts
index 36d78ca75..db939a0c7 100644
--- a/src/Squidex/app/shared/state/plans.state.ts
+++ b/src/Squidex/app/shared/state/plans.state.ts
@@ -21,7 +21,7 @@ import { AuthService } from './../services/auth.service';
 import { PlanDto, PlansService } from './../services/plans.service';
 import { AppsState } from './apps.state';
 
-interface PlanInfo {
+export interface PlanInfo {
     // The plan.
     plan: PlanDto;
 
@@ -136,5 +136,4 @@ export class PlansState extends State<Snapshot> {
     private get version() {
         return this.snapshot.version;
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/shared/state/queries.spec.ts b/src/Squidex/app/shared/state/queries.spec.ts
index b20d466c5..16fd7d890 100644
--- a/src/Squidex/app/shared/state/queries.spec.ts
+++ b/src/Squidex/app/shared/state/queries.spec.ts
@@ -5,7 +5,6 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-
 import { BehaviorSubject } from 'rxjs';
 import { IMock,  Mock, Times } from 'typemoq';
 
diff --git a/src/Squidex/app/shared/state/schemas.state.spec.ts b/src/Squidex/app/shared/state/schemas.state.spec.ts
index c75937495..9607e8372 100644
--- a/src/Squidex/app/shared/state/schemas.state.spec.ts
+++ b/src/Squidex/app/shared/state/schemas.state.spec.ts
@@ -5,7 +5,6 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-
 import { of, throwError } from 'rxjs';
 import { IMock, It, Mock, Times } from 'typemoq';
 
diff --git a/src/Squidex/app/shared/state/schemas.state.ts b/src/Squidex/app/shared/state/schemas.state.ts
index 3b3fbf798..e921befe6 100644
--- a/src/Squidex/app/shared/state/schemas.state.ts
+++ b/src/Squidex/app/shared/state/schemas.state.ts
@@ -11,6 +11,7 @@ import { catchError, tap } from 'rxjs/operators';
 
 import {
     compareStringsAsc,
+    defined,
     DialogService,
     ImmutableArray,
     shareMapSubscribed,
@@ -69,9 +70,12 @@ export class SchemasState extends State<Snapshot> {
     public categoriesPlain =
         this.project(x => x.categories);
 
-    public selectedSchema =
+    public selectedSchemaOrNull =
         this.project(x => x.selectedSchema, sameSchema);
 
+    public selectedSchema =
+        this.selectedSchemaOrNull.pipe(defined());
+
     public schemas =
         this.project(x => x.schemas);
 
diff --git a/src/Squidex/app/shared/state/ui.state.ts b/src/Squidex/app/shared/state/ui.state.ts
index 879a95cf0..48ca786c2 100644
--- a/src/Squidex/app/shared/state/ui.state.ts
+++ b/src/Squidex/app/shared/state/ui.state.ts
@@ -100,7 +100,7 @@ export class UIState extends State<Snapshot> {
         this.loadResources();
         this.loadCommon();
 
-        appsState.selectedValidApp.subscribe(app => {
+        appsState.selectedApp.subscribe(app => {
             this.load(app.name);
         });
     }
diff --git a/src/Squidex/app/shell/pages/app/app-area.component.html b/src/Squidex/app/shell/pages/app/app-area.component.html
index 7b9cd87ee..70f097a6e 100644
--- a/src/Squidex/app/shell/pages/app/app-area.component.html
+++ b/src/Squidex/app/shell/pages/app/app-area.component.html
@@ -1,3 +1,5 @@
+<sqx-title [message]="appsState.appDisplayName"></sqx-title>
+
 <div class="sidebar">
     <sqx-left-menu></sqx-left-menu>
 </div>
diff --git a/src/Squidex/app/shell/pages/app/app-area.component.ts b/src/Squidex/app/shell/pages/app/app-area.component.ts
index 3c9aab370..1837925de 100644
--- a/src/Squidex/app/shell/pages/app/app-area.component.ts
+++ b/src/Squidex/app/shell/pages/app/app-area.component.ts
@@ -7,9 +7,16 @@
 
 import { Component } from '@angular/core';
 
+import { AppsState } from '@app/shared';
+
 @Component({
     selector: 'sqx-app-area',
     styleUrls: ['./app-area.component.scss'],
     templateUrl: './app-area.component.html'
 })
-export class AppAreaComponent { }
\ No newline at end of file
+export class AppAreaComponent {
+    constructor(
+        public readonly appsState: AppsState
+    ) {
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/shell/pages/app/left-menu.component.html b/src/Squidex/app/shell/pages/app/left-menu.component.html
index 7bacd4188..6acbf046e 100644
--- a/src/Squidex/app/shell/pages/app/left-menu.component.html
+++ b/src/Squidex/app/shell/pages/app/left-menu.component.html
@@ -1,20 +1,20 @@
-<ul class="nav flex-column" *ngIf="appsState.selectedValidApp | async; let selectedApp">
-    <li class="nav-item" *ngIf="selectedApp.canReadSchemas">
+<ul class="nav flex-column" *ngIf="appsState.selectedApp | async; let app">
+    <li class="nav-item" *ngIf="app.canReadSchemas">
         <a class="nav-link" routerLink="schemas" routerLinkActive="active">
             <i class="nav-icon icon-schemas"></i> <div class="nav-text">Schemas</div>
         </a>
     </li>
-    <li class="nav-item" *ngIf="selectedApp.canAccessContent">
+    <li class="nav-item" *ngIf="app.canAccessContent">
         <a class="nav-link" routerLink="content" routerLinkActive="active">
             <i class="nav-icon icon-contents"></i> <div class="nav-text">Content</div>
         </a>
     </li>
-    <li class="nav-item" *ngIf="selectedApp.canReadAssets">
+    <li class="nav-item" *ngIf="app.canReadAssets">
         <a class="nav-link" routerLink="assets/filters" routerLinkActive="active">
             <i class="nav-icon icon-assets"></i> <div class="nav-text">Assets</div> 
         </a>
     </li>
-    <li class="nav-item" *ngIf="selectedApp.canReadRules">
+    <li class="nav-item" *ngIf="app.canReadRules">
         <a class="nav-link" routerLink="rules" routerLinkActive="active">
             <i class="nav-icon icon-rules"></i> <div class="nav-text">Rules</div>
         </a>
@@ -24,7 +24,7 @@
             <i class="nav-icon icon-settings"></i> <div class="nav-text">Settings</div>
         </a>
     </li>
-    <li class="nav-item" *ngIf="selectedApp.canAccessApi">
+    <li class="nav-item" *ngIf="app.canAccessApi">
         <a class="nav-link" routerLink="api" routerLinkActive="active">
             <i class="nav-icon icon-api"></i> <div class="nav-text">API</div>
         </a>
diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.html b/src/Squidex/app/shell/pages/internal/apps-menu.component.html
index 04e289486..505366f6e 100644
--- a/src/Squidex/app/shell/pages/internal/apps-menu.component.html
+++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.html
@@ -1,8 +1,8 @@
 <ul class="nav navbar-nav">
     <li class="nav-item dropdown">
         <span class="nav-link dropdown-toggle" id="app-name" (click)="appsMenu.toggle()">
-            <ng-container *ngIf="appsState.selectedApp | async; let selectedApp; else noApp">
-                {{selectedApp.displayName}}
+            <ng-container *ngIf="appsState.selectedAppOrNull | async; let app; else noApp">
+                {{app.displayName}}
             </ng-container>
 
             <ng-template #noApp>
@@ -40,13 +40,13 @@
         </ng-container>
     </li>
 
-    <ng-container *ngIf="appsState.selectedValidApp | async; let selectedApp">
-        <li class="nav-item" *ngIf="selectedApp.planUpgrade && selectedApp.planName">
+    <ng-container *ngIf="appsState.selectedApp | async; let app">
+        <li class="nav-item" *ngIf="app.planUpgrade && app.planName">
             <div class="btn-group app-upgrade">
                 <button type="button" class="btn btn-primary btn-plan">
-                    You are on the <strong>{{selectedApp.planName}}</strong> plan.
+                    You are on the <strong>{{app.planName}}</strong> plan.
                 </button>
-                <button type="button" class="btn btn-warning" [routerLink]="['/app', selectedApp.name, 'settings', 'plans']">
+                <button type="button" class="btn btn-warning" [routerLink]="['/app', app.name, 'settings', 'plans']">
                     Upgrade!
                 </button>
             </div>
diff --git a/src/Squidex/package-lock.json b/src/Squidex/package-lock.json
index bdbf14e8e..957e2cdab 100644
--- a/src/Squidex/package-lock.json
+++ b/src/Squidex/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@angular-devkit/core": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.1.tgz",
-      "integrity": "sha512-d/PNSZYtJ10tY/TILe3TiB9wLjuxMja/oR0PhdrfuadTF/blZ6Qjg8aVzImkwnvsm+0TgDkIXwcMKnoNa2LDxQ==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.4.tgz",
+      "integrity": "sha512-QjUN9EakpQ+sFYeMfBMecxVhgI4Vdg0k20h6PZDjZ9lqYNXjpaQVtBo7qiPYHh5kQeJEvdrzca6yeYuCP3TvZw==",
       "dev": true,
       "requires": {
         "ajv": "6.10.2",
@@ -68,34 +68,34 @@
       }
     },
     "@angular/animations": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.1.tgz",
-      "integrity": "sha512-+E2KWj798sgby1hnC2LmK380jCZ7JLcxs5X4pM+kwJzS4T8spPTBecHRqz19C2Ea4AOSou4S1Oxs/4CCmVnj2w==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.6.tgz",
+      "integrity": "sha512-beakpSjzF+bP2jCDmeGHwSim04u9x1Uf3dCFAj1CqRwJGb8POpUA1KlnGrEm2pzWzHKVqQH6VQ+8uGPLl17PFA==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/common": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.1.tgz",
-      "integrity": "sha512-CVewkkFswELDQ1qx2G7m2pj0IqDbSIY6O6wZtNvYCDrLXRVDwSXcQsjNP1pSWuD37dHT/nifimchfLiVuisPyg==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.6.tgz",
+      "integrity": "sha512-OlU3LCPShHJEsOHS+qczY52P0kWtjJD8N7NDHaGMB6Xp8GMgItjQIeeO6yf8DJyaCIC4qk4G7jPdnQk6IE1SbQ==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/compiler": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.1.tgz",
-      "integrity": "sha512-kOGNh0K4k7vEIMLlEyG1A+UxPOIMp2b3IT0vBq5isRjXxGzEnahyBYtXwGI7G6ox+OoNKy1OZOPaK473fcO8zg==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.6.tgz",
+      "integrity": "sha512-NdTY2n0XNRmKixbKDWB++9tEDLFwN0/Bp/1lXJ4qF/8V5Wju6IJ/UZZKjR5C4uiKtF17T3GzubhXgghumt5UVA==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.1.tgz",
-      "integrity": "sha512-q1jFpP6yedEzNY0QO50gRA4IkRSaZr5WSXVggE4fSF4Nhhn6k9pp4OaP9sYGLoO4OlvVbke4qIxNId1HDfx86g==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.6.tgz",
+      "integrity": "sha512-WLlBO/oGcQBKE8rYcENZQ4HgkbrmMqSNJXHLK/HnZpvbot2+mPiDXykI/p5rKdpAei/lgTU8g8GskoiDeLXsgw==",
       "dev": true,
       "requires": {
         "canonical-path": "1.0.0",
@@ -173,9 +173,9 @@
           }
         },
         "chokidar": {
-          "version": "2.1.6",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
-          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
           "dev": true,
           "requires": {
             "anymatch": "^2.0.0",
@@ -1036,17 +1036,17 @@
       }
     },
     "@angular/core": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.1.tgz",
-      "integrity": "sha512-BMyLo/iOZ/eRR25CggWT3cexzfOnoey13NPeqYRtsO5dQUeVQPT1RH/bIWZ6yIPFSlBm6zUi/QqE1rjDautK5A==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.6.tgz",
+      "integrity": "sha512-l+BrvPGwtPUh/rQyB9mjtonMsFEAoRHgDYWeQu/QukIZbItNdFqrhewn2zQ8Skx75BpwFLAVIVXp9ioDyvP2eQ==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/forms": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.1.tgz",
-      "integrity": "sha512-KcB652QBup+VWKDZICtpznr0a+v82oG0BowWetfkMgZAQj655uEMkkEtCTnfWnft4MLYlRr9ZoxQXc575TcZmA==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.6.tgz",
+      "integrity": "sha512-sYUspJYJGq0OaBuxgdUXPf0TwYyED9OVWNCl9jDJCW//2NAbrZG8BSujvV54Dtg2emY1Uc7EFyQ8Wc8yxS7KSg==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -1060,25 +1060,25 @@
       }
     },
     "@angular/platform-browser": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.1.tgz",
-      "integrity": "sha512-mzaXsHNTN3lBu3+H02GrRRu8Zo5R4GQiAb+MKdqiQMJ8hjnAmKJTYIVEbEnk/dJYbMZWvhxRGLmRIcntpYF38g==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.6.tgz",
+      "integrity": "sha512-wUgcdTXItforNA+6qykPL9SDmV1uSIUQcEZrm3YCoVt7CuwMav3dq9Lg1zZ7HKv0A8It0fAKpXBkamzpRxvZEw==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.1.tgz",
-      "integrity": "sha512-9tdpvEXFCgbMUeyVvIklyDPyg39cRN6MOrQihObAoBKOkcko9MKJIxDPCv8o/5FBrlBcu0VhREPK56aVD0g6UQ==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.6.tgz",
+      "integrity": "sha512-4azHzNBYYeyzIsktN2P+d0stCisOvYfxU7U0oD+FaGalxg2Ch1mGjnZA+5UcmbMZOOXo4TMcKmzpB6VcLGe+Hw==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/platform-server": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-8.2.1.tgz",
-      "integrity": "sha512-4YS3TKgfaFR/wgPoE42wCDAAK7FtRAl71yoVYppfPAbarmXrgv04RY4+ReQ9erYqbDY15HC/dyKcNTbhDAt2vw==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-8.2.6.tgz",
+      "integrity": "sha512-3zvhT0Z1E6KaFpldig3tGkWbIzA6GsQMHD32qNi3p1ruc88NoDXLW3EnQcJEGz4vg1gy7ejgbZitDbIDbYhK4w==",
       "requires": {
         "domino": "^2.1.2",
         "tslib": "^1.9.0",
@@ -1086,9 +1086,9 @@
       }
     },
     "@angular/router": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.1.tgz",
-      "integrity": "sha512-CIhwBmRoVaZmfvGjuUomiyWn7OdHqzKbHq0poI3jlNJZCmzuBicYFctjCeqG6L2BIN0eVuJUJNeQ0OrcicP52w==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.6.tgz",
+      "integrity": "sha512-XAqhrPbU+z/ztf2b0VxFytHPJRpWfhnhCJ2qf9Tie1Cov6zOlgIKInOSF+WtsFEUZAnwSbAfGk4KSXrwBWw8zA==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -1273,16 +1273,16 @@
       }
     },
     "@ngtools/webpack": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.2.1.tgz",
-      "integrity": "sha512-Cvn9PR1fNGO6YE392Cib3at8nD170FGig3ybkM0ePVcPcQZF7Ial2baod1QTc0knzXpUqqRY5D4puw0fNdOybA==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.3.4.tgz",
+      "integrity": "sha512-hNikQ6cjvCmA/bK8dor+oijPKF9sQAcM29FCPn3t0l3ucoVSOvbFpvtMYqlIHN5pw6WitZpImnkk2OW3o1JaDA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.2.1",
+        "@angular-devkit/core": "8.3.4",
         "enhanced-resolve": "4.1.0",
         "rxjs": "6.4.0",
         "tree-kill": "1.2.1",
-        "webpack-sources": "1.3.0"
+        "webpack-sources": "1.4.3"
       },
       "dependencies": {
         "rxjs": {
@@ -1293,6 +1293,16 @@
           "requires": {
             "tslib": "^1.9.0"
           }
+        },
+        "webpack-sources": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
+          }
         }
       }
     },
@@ -2550,9 +2560,9 @@
       "dev": true
     },
     "cacache": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz",
-      "integrity": "sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==",
+      "version": "12.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
+      "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
       "dev": true,
       "requires": {
         "bluebird": "^3.5.5",
@@ -2587,9 +2597,9 @@
           }
         },
         "graceful-fs": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz",
-          "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
           "dev": true
         },
         "lru-cache": {
@@ -2601,6 +2611,15 @@
             "yallist": "^3.0.2"
           }
         },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "y18n": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
@@ -3243,6 +3262,31 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "copy-descriptor": {
@@ -3693,9 +3737,9 @@
       "dev": true
     },
     "cyclist": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
       "dev": true
     },
     "d": {
@@ -3869,11 +3913,34 @@
         "rimraf": "^2.6.3"
       },
       "dependencies": {
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "pify": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
           "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
           "dev": true
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
         }
       }
     },
@@ -3945,9 +4012,9 @@
       "dev": true
     },
     "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
+      "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
       "dev": true
     },
     "diffie-hellman": {
@@ -4129,9 +4196,9 @@
       "dev": true
     },
     "elliptic": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
-      "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz",
+      "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
       "dev": true,
       "requires": {
         "bn.js": "^4.4.0",
@@ -4874,14 +4941,74 @@
       }
     },
     "find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.0.0.tgz",
+      "integrity": "sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==",
       "dev": true,
       "requires": {
         "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
+        "make-dir": "^3.0.0",
+        "pkg-dir": "^4.1.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz",
+          "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
     "find-index": {
@@ -5212,6 +5339,31 @@
         "graceful-fs": "^4.1.2",
         "rimraf": "~2.6.2",
         "write": "^0.2.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "flatted": {
@@ -5915,6 +6067,31 @@
         "inherits": "~2.0.0",
         "mkdirp": ">=0.5 0",
         "rimraf": "2"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "function-bind": {
@@ -7745,6 +7922,20 @@
             "ms": "^2.1.1"
           }
         },
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "istanbul-lib-coverage": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
@@ -7756,6 +7947,15 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
         }
       }
     },
@@ -7779,6 +7979,27 @@
       "integrity": "sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==",
       "dev": true
     },
+    "jest-worker": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+      "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+      "dev": true,
+      "requires": {
+        "merge-stream": "^2.0.0",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
     "js-base64": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
@@ -8041,6 +8262,31 @@
             "picomatch": "^2.0.4"
           }
         },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "7.1.4",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+              "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+              "dev": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            }
+          }
+        },
         "to-regex-range": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -8053,9 +8299,9 @@
       }
     },
     "karma-chrome-launcher": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.0.0.tgz",
-      "integrity": "sha512-u/PnVgDOP97AUe/gJeABlC6Wa6aQ83MZsm0JgsJQ5bGQ9XcXON/7b2aRhl59A62Zom+q3PFveBkczc7E1RT7TA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz",
+      "integrity": "sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==",
       "dev": true,
       "requires": {
         "which": "^1.2.1"
@@ -8634,6 +8880,12 @@
       "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
       "dev": true
     },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
     "mersenne-twister": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/mersenne-twister/-/mersenne-twister-1.1.0.tgz",
@@ -8819,6 +9071,31 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "ms": {
@@ -8969,6 +9246,31 @@
         "which": "1"
       },
       "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "7.1.4",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+              "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+              "dev": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            }
+          }
+        },
         "semver": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
@@ -9540,12 +9842,12 @@
       "dev": true
     },
     "parallel-transform": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
       "dev": true,
       "requires": {
-        "cyclist": "~0.2.2",
+        "cyclist": "^1.0.1",
         "inherits": "^2.0.3",
         "readable-stream": "^2.1.5"
       }
@@ -11037,18 +11339,18 @@
       "dev": true
     },
     "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz",
+      "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==",
       "dev": true,
       "requires": {
         "glob": "^7.1.3"
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -11331,23 +11633,98 @@
       }
     },
     "sass-loader": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.2.0.tgz",
-      "integrity": "sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz",
+      "integrity": "sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==",
       "dev": true,
       "requires": {
         "clone-deep": "^4.0.1",
-        "loader-utils": "^1.0.1",
-        "neo-async": "^2.5.0",
-        "pify": "^4.0.1",
-        "semver": "^5.5.0"
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.1.0",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+        "ajv": {
+          "version": "6.10.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+          "dev": true
+        },
+        "big.js": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+          "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
+        },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^2.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "schema-utils": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.2.0.tgz",
+          "integrity": "sha512-5EwsCNhfFTZvUreQhx/4vVQpJ/lnCAkgoIHLhSpp4ZirE+4hzFvdJi0FMub6hxbFVBJYSpeVVmon+2e7uEGRrA==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.10.2",
+            "ajv-keywords": "^3.4.1"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "uri-js": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+          "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+          "dev": true,
+          "requires": {
+            "punycode": "^2.1.0"
+          }
         }
       }
     },
@@ -11464,9 +11841,9 @@
       }
     },
     "serialize-javascript": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
-      "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.0.tgz",
+      "integrity": "sha512-a/mxFfU00QT88umAJQsNWOnUKckhNCqOl028N48e7wFmo2/EHpTo9Wso+iJJCMrQnmFvcjto5RJdAHEvVhcyUQ==",
       "dev": true
     },
     "serve-index": {
@@ -12565,9 +12942,9 @@
       }
     },
     "terser": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.2.1.tgz",
-      "integrity": "sha512-cGbc5utAcX4a9+2GGVX4DsenG6v0x3glnDi5hx8816X1McEAwPlPgRtXPJzSBsbpILxZ8MQMT0KvArLuE0HP5A==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.1.tgz",
+      "integrity": "sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -12584,22 +12961,70 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
-      "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.0.1.tgz",
+      "integrity": "sha512-DXx8f7080P2dgW9Ydd7MUon81AL+GkGr9prfQRf+rH06dRrgCGIvtT7q73JRm2UzmjKeJGtro9O8zwL2y2udag==",
       "dev": true,
       "requires": {
-        "cacache": "^12.0.2",
-        "find-cache-dir": "^2.1.0",
-        "is-wsl": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.7.0",
+        "cacache": "^12.0.3",
+        "find-cache-dir": "^3.0.0",
+        "jest-worker": "^24.9.0",
+        "schema-utils": "^2.2.0",
+        "serialize-javascript": "^2.1.0",
         "source-map": "^0.6.1",
-        "terser": "^4.1.2",
-        "webpack-sources": "^1.4.0",
-        "worker-farm": "^1.7.0"
+        "terser": "^4.2.1",
+        "webpack-sources": "^1.4.3"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.10.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.2.0.tgz",
+          "integrity": "sha512-5EwsCNhfFTZvUreQhx/4vVQpJ/lnCAkgoIHLhSpp4ZirE+4hzFvdJi0FMub6hxbFVBJYSpeVVmon+2e7uEGRrA==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.10.2",
+            "ajv-keywords": "^3.4.1"
+          }
+        },
+        "uri-js": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+          "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+          "dev": true,
+          "requires": {
+            "punycode": "^2.1.0"
+          }
+        },
         "webpack-sources": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
@@ -12787,9 +13212,9 @@
       }
     },
     "ts-loader": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.0.4.tgz",
-      "integrity": "sha512-p2zJYe7OtwR+49kv4gs7v4dMrfYD1IPpOtqiSPCbe8oR+4zEBtdHwzM7A7M91F+suReqgzZrlClk4LRSSp882g==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.1.0.tgz",
+      "integrity": "sha512-7JedeOu2rsYHQDEr2fwmMozABwbQTZXEaEMZPSIWG7gpzRefOLJCqwdazcegHtyaxp04PeEgs/b0m08WMpnIzQ==",
       "dev": true,
       "requires": {
         "chalk": "^2.3.0",
@@ -12834,9 +13259,9 @@
           }
         },
         "semver": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
-          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
         "to-regex-range": {
@@ -12897,16 +13322,16 @@
       "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
     },
     "tslint": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.18.0.tgz",
-      "integrity": "sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==",
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.0.tgz",
+      "integrity": "sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "builtin-modules": "^1.1.1",
         "chalk": "^2.3.0",
         "commander": "^2.12.1",
-        "diff": "^3.2.0",
+        "diff": "^4.0.1",
         "glob": "^7.1.1",
         "js-yaml": "^3.13.1",
         "minimatch": "^3.0.4",
@@ -13398,9 +13823,9 @@
           }
         },
         "chokidar": {
-          "version": "2.1.6",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
-          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
           "dev": true,
           "requires": {
             "anymatch": "^2.0.0",
@@ -14270,9 +14695,9 @@
       }
     },
     "webpack": {
-      "version": "4.39.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz",
-      "integrity": "sha512-/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.40.2.tgz",
+      "integrity": "sha512-5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A==",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
@@ -14528,6 +14953,17 @@
             }
           }
         },
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -14636,12 +15072,35 @@
             "to-regex": "^3.0.2"
           }
         },
+        "serialize-javascript": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+          "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
+          "dev": true
+        },
         "tapable": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
           "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
           "dev": true
         },
+        "terser-webpack-plugin": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
+          "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
+          "dev": true,
+          "requires": {
+            "cacache": "^12.0.2",
+            "find-cache-dir": "^2.1.0",
+            "is-wsl": "^1.1.0",
+            "schema-utils": "^1.0.0",
+            "serialize-javascript": "^1.7.0",
+            "source-map": "^0.6.1",
+            "terser": "^4.1.2",
+            "webpack-sources": "^1.4.0",
+            "worker-farm": "^1.7.0"
+          }
+        },
         "uri-js": {
           "version": "4.2.2",
           "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -14664,9 +15123,9 @@
       }
     },
     "webpack-cli": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.6.tgz",
-      "integrity": "sha512-0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz",
+      "integrity": "sha512-RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==",
       "dev": true,
       "requires": {
         "chalk": "2.4.2",
diff --git a/src/Squidex/package.json b/src/Squidex/package.json
index c206dcad3..902775629 100644
--- a/src/Squidex/package.json
+++ b/src/Squidex/package.json
@@ -15,15 +15,15 @@
     "build:clean": "rimraf wwwroot/build"
   },
   "dependencies": {
-    "@angular/animations": "8.2.1",
-    "@angular/common": "8.2.1",
-    "@angular/core": "8.2.1",
-    "@angular/forms": "8.2.1",
+    "@angular/animations": "8.2.6",
+    "@angular/common": "8.2.6",
+    "@angular/core": "8.2.6",
+    "@angular/forms": "8.2.6",
     "@angular/http": "7.2.15",
-    "@angular/platform-browser": "8.2.1",
-    "@angular/platform-browser-dynamic": "8.2.1",
-    "@angular/platform-server": "8.2.1",
-    "@angular/router": "8.2.1",
+    "@angular/platform-browser": "8.2.6",
+    "@angular/platform-browser-dynamic": "8.2.6",
+    "@angular/platform-server": "8.2.6",
+    "@angular/router": "8.2.6",
     "angular2-chartjs": "0.5.1",
     "babel-polyfill": "6.26.0",
     "bootstrap": "4.3.1",
@@ -48,9 +48,9 @@
     "zone.js": "0.10.1"
   },
   "devDependencies": {
-    "@angular/compiler": "8.2.1",
-    "@angular/compiler-cli": "8.2.1",
-    "@ngtools/webpack": "8.2.1",
+    "@angular/compiler": "8.2.6",
+    "@angular/compiler-cli": "8.2.6",
+    "@ngtools/webpack": "8.3.4",
     "@types/core-js": "2.5.2",
     "@types/jasmine": "3.4.0",
     "@types/marked": "0.6.5",
@@ -73,7 +73,7 @@
     "istanbul-instrumenter-loader": "3.0.1",
     "jasmine-core": "3.4.0",
     "karma": "4.2.0",
-    "karma-chrome-launcher": "3.0.0",
+    "karma-chrome-launcher": "3.1.0",
     "karma-cli": "2.0.0",
     "karma-coverage-istanbul-reporter": "2.1.0",
     "karma-htmlfile-reporter": "0.3.8",
@@ -86,21 +86,21 @@
     "node-sass": "4.12.0",
     "optimize-css-assets-webpack-plugin": "5.0.3",
     "raw-loader": "1.0.0",
-    "rimraf": "2.6.3",
+    "rimraf": "3.0.0",
     "rxjs-tslint": "0.1.7",
     "sass-lint": "1.13.1",
-    "sass-loader": "7.2.0",
+    "sass-loader": "8.0.0",
     "style-loader": "1.0.0",
-    "terser-webpack-plugin": "^1.4.1",
-    "ts-loader": "6.0.4",
+    "terser-webpack-plugin": "2.0.1",
+    "ts-loader": "6.1.0",
     "tsconfig-paths-webpack-plugin": "3.2.0",
-    "tslint": "5.18.0",
+    "tslint": "5.20.0",
     "tslint-webpack-plugin": "2.1.0",
     "typemoq": "2.1.0",
     "typescript": "3.5.3",
     "underscore": "1.9.1",
-    "webpack": "4.39.1",
-    "webpack-cli": "3.3.6",
+    "webpack": "4.40.2",
+    "webpack-cli": "3.3.8",
     "webpack-dev-server": "3.8.0"
   }
 }
diff --git a/src/Squidex/tslint.json b/src/Squidex/tslint.json
index 28da3b6d8..b0ab51858 100644
--- a/src/Squidex/tslint.json
+++ b/src/Squidex/tslint.json
@@ -45,6 +45,7 @@
     "no-arg": true,
     "no-attribute-parameter-decorator": true,
     "no-bitwise": true,
+    "no-consecutive-blank-lines": true,
     "no-console": [
       true,
       "debug",