diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4653526c..3f46b622 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -54,29 +54,5 @@
             "runMode": "on-demand",
             "jestCommandLine": "node --experimental-vm-modules --no-warnings ../../node_modules/jest/bin/jest.js"
         }
-    ],
-    "karmaTestExplorer.projectWorkspaces": [
-        {
-            "rootPath": "projects/aas-lib",
-            // "karmaConfFilePath": "karma.config.cjs",
-            "testFramework": "jasmine",
-            "projectType": "angular",
-            "testsBasePath": "src/test",
-            // "testFiles": [
-            //     "src/**/*.spec.ts"
-            // ],
-            // "excludeFiles": ["dist/**/*.*"]
-        },
-        {
-            "rootPath": "projects/aas-portal",
-            "karmaConfFilePath": "karma.config.cjs",
-            "testFramework": "jasmine",
-            "projectType": "angular",
-            // "testsBasePath": "src/test",
-            // "testFiles": [
-            //     "src/**/*.spec.ts"
-            // ],
-            // "excludeFiles": ["dist/**/*.*"]
-        }
     ]
 }
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/aas-tree/aas-tree.component.html b/projects/aas-lib/src/lib/aas-tree/aas-tree.component.html
index f301ac14..01f31c8c 100644
--- a/projects/aas-lib/src/lib/aas-tree/aas-tree.component.html
+++ b/projects/aas-lib/src/lib/aas-tree/aas-tree.component.html
@@ -6,6 +6,7 @@
  !
  !---------------------------------------------------------------------------->
 
+@if (document?.content) {
 <table class="table table-sm table-hover table-striped align-middle">
     <thead>
         <tr>
@@ -126,3 +127,8 @@
         }
     </tbody>
 </table>
+} @else {
+<div class="position-relative">
+    <div class="position-absolute top-50 start-50 translate-middle">Keinen Kontent</div>
+</div>
+}
\ No newline at end of file
diff --git a/projects/aas-lib/src/lib/auth/auth.service.ts b/projects/aas-lib/src/lib/auth/auth.service.ts
index 90671fde..66e5ae4e 100644
--- a/projects/aas-lib/src/lib/auth/auth.service.ts
+++ b/projects/aas-lib/src/lib/auth/auth.service.ts
@@ -9,7 +9,7 @@
 import { Injectable } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, catchError, from, map, mergeMap, Observable, of, throwError } from 'rxjs';
+import { BehaviorSubject, catchError, first, from, map, mergeMap, Observable, of, throwError } from 'rxjs';
 import { jwtDecode } from 'jwt-decode';
 import {
     ApplicationError,
@@ -255,12 +255,18 @@ export class AuthService {
      * @returns The cookie value.
      */
     public getCookie(name: string): Observable<string | undefined> {
-        const payload = this.payload$.getValue();
-        if (payload && payload.sub) {
-            return this.api.getCookie(payload.sub, name).pipe(map(cookie => cookie?.data));
-        } else {
-            return of(this.window.getLocalStorageItem(name) ?? undefined);
-        }
+        return this.ready.pipe(
+            first(ready => ready === true),
+            mergeMap(() => this.payload),
+            first(),
+            mergeMap(payload => {
+                if (payload && payload.sub) {
+                    return this.api.getCookie(payload.sub, name).pipe(map(cookie => cookie?.data));
+                }
+
+                return of(this.window.getLocalStorageItem(name) ?? undefined);
+            }),
+        );
     }
 
     /**
diff --git a/projects/aas-lib/src/test/max-length/max-length.pipe.spec.ts b/projects/aas-lib/src/test/max-length/max-length.pipe.spec.ts
index 7f84a11b..5c2cfe61 100644
--- a/projects/aas-lib/src/test/max-length/max-length.pipe.spec.ts
+++ b/projects/aas-lib/src/test/max-length/max-length.pipe.spec.ts
@@ -6,7 +6,7 @@
  *
  *****************************************************************************/
 
-import { MaxLengthPipe } from "../../lib/max-length.pipe";
+import { MaxLengthPipe } from '../../lib/max-length.pipe';
 
 describe('MaxLengthPipe', () => {
     it('create an instance', () => {
@@ -19,8 +19,8 @@ describe('MaxLengthPipe', () => {
         expect(pipe.transform('0123456789', 10)).toEqual('0123456789');
     });
 
-    it('does not transform if text length <= max', function () {
+    it('transform if text length > max', function () {
         const pipe = new MaxLengthPipe();
         expect(pipe.transform('0123456789', 5)).toEqual('0...9');
     });
-});
\ No newline at end of file
+});
diff --git a/projects/aas-lib/src/test/score/score.component.spec.ts b/projects/aas-lib/src/test/score/score.component.spec.ts
index f26d4232..10ed41ca 100644
--- a/projects/aas-lib/src/test/score/score.component.spec.ts
+++ b/projects/aas-lib/src/test/score/score.component.spec.ts
@@ -10,7 +10,6 @@ import { SimpleChange } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ScoreComponent } from '../../lib/score/score.component';
 
-
 describe('ScoreComponent', () => {
     let component: ScoreComponent;
     let fixture: ComponentFixture<ScoreComponent>;
@@ -19,7 +18,7 @@ describe('ScoreComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [ScoreComponent]
+            declarations: [ScoreComponent],
         });
 
         fixture = TestBed.createComponent(ScoreComponent);
@@ -48,7 +47,7 @@ describe('ScoreComponent', () => {
         expect(positiveDiv.style.width).toEqual('42%');
         expect(negativeDiv.style.width).toEqual('0%');
     });
-    
+
     it('it shows a negative score', function () {
         component.score = -0.42;
         component.ngOnChanges({ score: new SimpleChange(0, component.score, true) });
@@ -79,8 +78,8 @@ describe('ScoreComponent', () => {
         expect(component.positive).toEqual(100);
         expect(component.negative).toEqual(0);
     });
-    
-    it('it shows a negative score', function () {
+
+    it('it shows a 100% negative score', function () {
         component.score = -1234567.89;
         component.ngOnChanges({ score: new SimpleChange(0, component.score, true) });
         fixture.detectChanges();
@@ -88,4 +87,4 @@ describe('ScoreComponent', () => {
         expect(component.negative).toEqual(100);
         expect(component.positive).toEqual(0);
     });
-});
\ No newline at end of file
+});
diff --git a/projects/aas-portal/src/app/aas/aas-api.service.ts b/projects/aas-portal/src/app/aas/aas-api.service.ts
index c5febaaf..b574122b 100644
--- a/projects/aas-portal/src/app/aas/aas-api.service.ts
+++ b/projects/aas-portal/src/app/aas/aas-api.service.ts
@@ -8,7 +8,7 @@
 
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { AASDocument } from 'common';
+import { AASDocument, aas } from 'common';
 import { Observable } from 'rxjs';
 import { encodeBase64Url } from 'aas-lib';
 
@@ -22,19 +22,31 @@ export class AASApiService {
     /**
      * Gets the AAS document with the specified identifier.
      * @param id The AAS identifier.
-     * @param name The AAS container name.
+     * @param endpoint The endpoint name.
      * @returns The requested AAS document.
      */
-    public getDocument(id: string, name?: string): Observable<AASDocument> {
-        if (name) {
+    public getDocument(id: string, endpoint?: string): Observable<AASDocument> {
+        if (endpoint) {
             return this.http.get<AASDocument>(
-                `/api/v1/containers/${encodeBase64Url(name)}/documents/${encodeBase64Url(id)}`,
+                `/api/v1/containers/${encodeBase64Url(endpoint)}/documents/${encodeBase64Url(id)}`,
             );
         }
 
         return this.http.get<AASDocument>(`/api/v1/documents/${encodeBase64Url(id)}`);
     }
 
+    /**
+     * Loads the element structure of the specified document.
+     * @param endpoint The endpoint name.
+     * @param id The identification of the AAS document.
+     * @returns The root of the element structure.
+     */
+    public getContent(id: string, endpoint: string): Observable<aas.Environment> {
+        return this.http.get<aas.Environment>(
+            `/api/v1/containers/${encodeBase64Url(endpoint)}/documents/${encodeBase64Url(id)}/content`,
+        );
+    }
+
     /**
      * Applies a changed AAS document.
      * @param document The document to apply.
diff --git a/projects/aas-portal/src/app/aas/aas.actions.ts b/projects/aas-portal/src/app/aas/aas.actions.ts
index 1c36d17c..fd890a6c 100644
--- a/projects/aas-portal/src/app/aas/aas.actions.ts
+++ b/projects/aas-portal/src/app/aas/aas.actions.ts
@@ -12,6 +12,7 @@ import { AASDocument } from 'common';
 
 export enum AASActionType {
     GET_DOCUMENT = '[AAS] get document',
+    GET_DOCUMENT_CONTENT = '[AAS] get document content',
     SET_DOCUMENT = '[AAS] set document',
     APPLY_DOCUMENT = '[AAS] apply document',
     RESET_MODIFIED = '[AAS] reset modified',
@@ -25,8 +26,14 @@ export interface GetDocumentAction extends TypedAction<AASActionType.GET_DOCUMEN
     name?: string;
 }
 
+export interface GetDocumentContentAction extends TypedAction<AASActionType.GET_DOCUMENT_CONTENT> {
+    document: AASDocument;
+}
+
 export const getDocument = createAction(AASActionType.GET_DOCUMENT, props<{ id: string; name?: string }>());
 
+export const getDocumentContent = createAction(AASActionType.GET_DOCUMENT_CONTENT, props<{ document: AASDocument }>());
+
 export const setDocument = createAction(AASActionType.SET_DOCUMENT, props<{ document: AASDocument | null }>());
 
 export const applyDocument = createAction(AASActionType.APPLY_DOCUMENT, props<{ document: AASDocument }>());
diff --git a/projects/aas-portal/src/app/aas/aas.component.html b/projects/aas-portal/src/app/aas/aas.component.html
index 54cb038f..d53bdc9a 100644
--- a/projects/aas-portal/src/app/aas/aas.component.html
+++ b/projects/aas-portal/src/app/aas/aas.component.html
@@ -6,7 +6,8 @@
  !
  !---------------------------------------------------------------------------->
 
-<div id="start-container" class="container-fluid">
+@if((document | async) !== null) {
+<div id="aas-container" class="container-fluid">
     <div class="row mt-1">
         <div class="d-flex flex-row">
             <div class="border border-secondary rounded p-1">
@@ -103,4 +104,7 @@
             <i class="bi bi-chevron-up"></i>
         </button>
     </div>
-</ng-template>
\ No newline at end of file
+</ng-template>
+} @else {
+<div>Kein Document</div>
+}
\ No newline at end of file
diff --git a/projects/aas-portal/src/app/aas/aas.component.ts b/projects/aas-portal/src/app/aas/aas.component.ts
index 38252b4d..b7f58d7e 100644
--- a/projects/aas-portal/src/app/aas/aas.component.ts
+++ b/projects/aas-portal/src/app/aas/aas.component.ts
@@ -153,10 +153,12 @@ export class AASComponent implements OnInit, OnDestroy, AfterViewInit {
 
                 if (params) {
                     const document: AASDocument = this.clipboard.get('AASDocument');
-                    if (!document || !document.content) {
+                    if (!document) {
                         this.store.dispatch(AASActions.getDocument({ id: params.id, name: params.endpoint }));
+                    } else if (!document.content) {
+                        this.store.dispatch(AASActions.getDocumentContent({ document: document }));
                     } else {
-                        this.store.dispatch(AASActions.setDocument({ document: document }));
+                        this.store.dispatch(AASActions.setDocument({ document }));
                     }
                 }
             }),
diff --git a/projects/aas-portal/src/app/aas/aas.effects.ts b/projects/aas-portal/src/app/aas/aas.effects.ts
index 3c176f87..58ecaf22 100644
--- a/projects/aas-portal/src/app/aas/aas.effects.ts
+++ b/projects/aas-portal/src/app/aas/aas.effects.ts
@@ -8,7 +8,7 @@
 
 import { Injectable } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { exhaustMap, map } from 'rxjs';
+import { catchError, exhaustMap, map, of } from 'rxjs';
 
 import * as AASActions from './aas.actions';
 import { AASApiService } from './aas-api.service';
@@ -24,9 +24,22 @@ export class AASEffects {
         return this.actions.pipe(
             ofType<AASActions.GetDocumentAction>(AASActions.AASActionType.GET_DOCUMENT),
             exhaustMap(action =>
-                this.api
-                    .getDocument(action.id, action.name)
-                    .pipe(map(document => AASActions.setDocument({ document }))),
+                this.api.getDocument(action.id, action.name).pipe(
+                    map(document => AASActions.setDocument({ document })),
+                    catchError(() => of(AASActions.setDocument({ document: null }))),
+                ),
+            ),
+        );
+    });
+
+    public getDocumentContent = createEffect(() => {
+        return this.actions.pipe(
+            ofType<AASActions.GetDocumentContentAction>(AASActions.AASActionType.GET_DOCUMENT_CONTENT),
+            exhaustMap(action =>
+                this.api.getContent(action.document.id, action.document.endpoint).pipe(
+                    map(content => AASActions.setDocument({ document: { ...action.document, content } })),
+                    catchError(() => of(AASActions.setDocument({ document: action.document }))),
+                ),
             ),
         );
     });
diff --git a/projects/aas-portal/src/app/start/favorites-form/favorites-form.component.html b/projects/aas-portal/src/app/start/favorites-form/favorites-form.component.html
index 4d1609d4..7540fe65 100644
--- a/projects/aas-portal/src/app/start/favorites-form/favorites-form.component.html
+++ b/projects/aas-portal/src/app/start/favorites-form/favorites-form.component.html
@@ -29,20 +29,23 @@ <h4 class="modal-title">
                     autocomplete="false" (change)="selected($event.target, item)" [checked]="item.selected">
                 <input class="form-control no-border" type="text" name="item.name"
                     (input)="valueChanged($event.target, item)" [value]="item.name" required>
-                <button class="btn text-success fs-5 p-0 me-2" type="button" [hidden]="!item.active && !item.selected"
-                    (click)="add(item)">
-                    <i class="bi bi-plus-lg"></i>
-                </button>
                 <button class="btn text-danger fs-5 p-0" type="button" [hidden]="!item.active && !item.selected"
                     (click)="delete(item)">
                     <i class="bi bi-trash"></i>
                 </button>
             </div>
+            @if(item.selected && text) {
+            <div class="fw-light ts-small">{{text}}</div>
+            }
         </li>
         }
     </ul>
 </div>
 <div class="modal-footer">
+    <div class="position-absolute start-0 ms-3">
+        <a class="link-opacity-50-hover" href="javascript:void(0)" (click)="addNew()"
+            translate>CMD_ADD_NEW_FAVORITES_LIST</a>
+    </div>
     <button type="submit" class="btn btn-primary" (click)="submit()" translate>CMD_OK</button>
     <button type="button" class="btn btn-secondary" (click)="cancel()" translate>CMD_CANCEL</button>
 </div>
\ No newline at end of file
diff --git a/projects/aas-portal/src/app/start/favorites-form/favorites-form.component.ts b/projects/aas-portal/src/app/start/favorites-form/favorites-form.component.ts
index cac72d4d..7e16f29e 100644
--- a/projects/aas-portal/src/app/start/favorites-form/favorites-form.component.ts
+++ b/projects/aas-portal/src/app/start/favorites-form/favorites-form.component.ts
@@ -8,7 +8,7 @@
 
 import { Component } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { AASDocument, ApplicationError } from 'common';
+import { AASDocument, ApplicationError, stringFormat } from 'common';
 import { FavoritesService } from '../favorites.service';
 import { first, from, map, mergeMap, of, tap } from 'rxjs';
 import { messageToString } from 'aas-lib';
@@ -80,6 +80,18 @@ export class FavoritesFormComponent {
         return this._items.filter(item => item.delete === false);
     }
 
+    public get text(): string {
+        if (this.documents.length === 0) {
+            return '';
+        }
+
+        if (this.documents.length === 1) {
+            return this.translate.instant('TEXT_ADD_FAVORITE');
+        }
+
+        return stringFormat(this.translate.instant('TEXT_ADD_FAVORITES'), this.documents.length);
+    }
+
     public delete(item: FavoritesItem): void {
         if (item.added) {
             this._items.splice(this._items.indexOf(item), 1);
@@ -88,12 +100,13 @@ export class FavoritesFormComponent {
         }
     }
 
-    public add(sibling: FavoritesItem): void {
+    public addNew(): void {
         const name = this.uniqueName();
-        this._items.splice(this.items.indexOf(sibling) + 1, 0, {
+        this._items.forEach(i => (i.selected = false));
+        this._items.push({
             name: name,
             id: name,
-            selected: false,
+            selected: true,
             active: false,
             added: true,
             delete: false,
diff --git a/projects/aas-portal/src/app/start/start-api.service.ts b/projects/aas-portal/src/app/start/start-api.service.ts
index fa161988..3861b37e 100644
--- a/projects/aas-portal/src/app/start/start-api.service.ts
+++ b/projects/aas-portal/src/app/start/start-api.service.ts
@@ -79,13 +79,13 @@ export class StartApiService {
 
     /**
      * Loads the element structure of the specified document.
-     * @param endpointName The URL of the container.
+     * @param endpoint The endpoint name.
      * @param id The identification of the AAS document.
      * @returns The root of the element structure.
      */
-    public getContent(endpointName: string, id: string): Observable<aas.Environment> {
+    public getContent(endpoint: string, id: string): Observable<aas.Environment> {
         return this.http.get<aas.Environment>(
-            `/api/v1/containers/${encodeBase64Url(endpointName)}/documents/${encodeBase64Url(id)}/content`,
+            `/api/v1/containers/${encodeBase64Url(endpoint)}/documents/${encodeBase64Url(id)}/content`,
         );
     }
 
diff --git a/projects/aas-portal/src/app/start/start.component.html b/projects/aas-portal/src/app/start/start.component.html
index 7a0706d2..35c44079 100644
--- a/projects/aas-portal/src/app/start/start.component.html
+++ b/projects/aas-portal/src/app/start/start.component.html
@@ -16,8 +16,8 @@
         <button class="btn btn-outline-primary" type="button" (click)="addToFavorites().subscribe()">
             <i class="bi bi-star"></i>
         </button>
-        <select [ngClass]="currentFavorites ? 'form-select fst-normal fw-normal' : 'form-select fst-italic fw-light'"
-            [(ngModel)]="currentFavorites">
+        <select #selectFavorites [ngClass]="currentFavorites ? 'form-select fst-normal fw-normal' : 'form-select fst-italic fw-light'"
+            [value]="currentFavorites | async" (change)="setCurrentFavorites(selectFavorites.value)">
             @for (option of (favoritesLists | async); track option; let i = $index) {
             @if (i === 0) {
             <option class="fst-italic fw-light" [value]="''" translate>FAVORITES</option>
@@ -28,13 +28,20 @@
         </select>
     </div>
     @if (!currentFavorites) {
-    <div class="btn-group me-2">
+    <div class="input-group me-2">
         <button type="button" class="btn btn-primary" (click)="firstPage()" [disabled]="isFirstPage | async">
             <i class="bi bi-chevron-bar-left"></i>
         </button>
         <button type="button" class="btn btn-primary" (click)="previousPage()" [disabled]="isFirstPage | async">
             <i class="bi bi-chevron-left"></i>
         </button>
+        <select #selectLimit class="form-select" [value]="limit | async" (change)="setLimit(selectLimit.value)">
+            <option value="10">10</option>
+            <option value="20">20</option>
+            <option value="30">30</option>
+            <option value="40">40</option>
+            <option value="50">50</option>
+        </select>
         <button type="button" class="btn btn-primary" (click)="nextPage()" [disabled]="isLastPage | async">
             <i class="bi bi-chevron-right"></i>
         </button>
@@ -78,12 +85,12 @@
     </div>
     <div class="btn-group me-2" id="viewModeGroup">
         <input type="radio" [value]="'list'" class="btn-check" id="viewModeList" name="viewModeGroup" autocomplete="off"
-            (change)="setViewMode('list')" [checked]="(viewMode | async) === 'list'">
+            (change)="setViewMode('list').subscribe()" [checked]="(viewMode | async) === 'list'">
         <label class="btn btn-primary" for="viewModeList">
             <i class="bi bi-list"></i>
         </label>
         <input type="radio" [value]="'tree'" class="btn-check" id="viewModeTree" name="viewModeGroup" autocomplete="off"
-            (change)="setViewMode('tree')" [checked]="(viewMode | async) === 'tree'">
+            (change)="setViewMode('tree').subscribe()" [checked]="(viewMode | async) === 'tree'">
         <label class="btn btn-primary" for="viewModeTree">
             <i class="bi bi-diagram-3"></i>
         </label>
diff --git a/projects/aas-portal/src/app/start/start.component.ts b/projects/aas-portal/src/app/start/start.component.ts
index 5d1b92f0..7eb7e49b 100644
--- a/projects/aas-portal/src/app/start/start.component.ts
+++ b/projects/aas-portal/src/app/start/start.component.ts
@@ -50,7 +50,6 @@ export class StartComponent implements OnDestroy, AfterViewInit {
     private readonly subscription = new Subscription();
     private readonly someSelectedDocuments = new BehaviorSubject<boolean>(true);
     private _selected: AASDocument[] = [];
-    private _currentFavorites = '';
 
     public constructor(
         store: Store,
@@ -75,6 +74,7 @@ export class StartComponent implements OnDestroy, AfterViewInit {
         this.isLastPage = this.store.select(StartSelectors.selectIsLastPage);
         this.documents = this.store.select(StartSelectors.selectDocuments);
         this.viewMode = this.store.select(StartSelectors.selectViewMode);
+        this.currentFavorites = this.store.select(StartSelectors.selectCurrentFavorites);
         this.endpoints = this.api.getEndpoints();
 
         this.store
@@ -89,37 +89,12 @@ export class StartComponent implements OnDestroy, AfterViewInit {
                 next: () => this.store.dispatch(StartActions.getFirstPage({})),
                 error: error => this.notify.error(error),
             });
-
-        this.subscription.add(
-            this.store
-                .select(StartSelectors.selectCurrentFavorites)
-                .pipe()
-                .subscribe(value => (this._currentFavorites = value)),
-        );
     }
 
     @ViewChild('startToolbar', { read: TemplateRef })
     public startToolbar: TemplateRef<unknown> | null = null;
 
-    public get currentFavorites(): string {
-        return this._currentFavorites;
-    }
-
-    public set currentFavorites(value: string) {
-        if (value !== this._currentFavorites) {
-            const currentFavorites = this.favorites.get(value);
-            if (currentFavorites) {
-                this.store.dispatch(
-                    StartActions.getFavorites({
-                        name: currentFavorites.name,
-                        documents: currentFavorites.documents,
-                    }),
-                );
-            } else {
-                this.store.dispatch(StartActions.getFirstPage({}));
-            }
-        }
-    }
+    public readonly currentFavorites: Observable<string>;
 
     public readonly favoritesLists: Observable<string[]> = this.favorites.lists.pipe(
         map(lists => ['', ...lists.map(list => list.name)]),
@@ -179,26 +154,45 @@ export class StartComponent implements OnDestroy, AfterViewInit {
         this.subscription.unsubscribe();
     }
 
-    public setViewMode(viewMode: string | ViewMode): void {
-        if (viewMode === ViewMode.List) {
-            if (!this._currentFavorites) {
-                this.store.dispatch(StartActions.setListView());
-            } else {
-                const favoritesList = this.favorites.get(this._currentFavorites);
-                if (favoritesList) {
-                    this.store.dispatch(
-                        StartActions.getFavorites({
-                            name: favoritesList.name,
-                            documents: favoritesList.documents,
-                        }),
-                    );
-                }
-            }
+    public setCurrentFavorites(value: string): void {
+        const currentFavorites = this.favorites.get(value);
+        if (currentFavorites) {
+            this.store.dispatch(
+                StartActions.getFavorites({
+                    name: currentFavorites.name,
+                    documents: currentFavorites.documents,
+                }),
+            );
         } else {
-            this.store.dispatch(StartActions.setTreeView({ documents: this._selected }));
+            this.store.dispatch(StartActions.getFirstPage({}));
         }
     }
 
+    public setViewMode(viewMode: string | ViewMode): Observable<void> {
+        return this.currentFavorites.pipe(
+            first(),
+            map(currentFavorites => {
+                if (viewMode === ViewMode.List) {
+                    if (!currentFavorites) {
+                        this.store.dispatch(StartActions.setListView());
+                    } else {
+                        const favoritesList = this.favorites.get(currentFavorites);
+                        if (favoritesList) {
+                            this.store.dispatch(
+                                StartActions.getFavorites({
+                                    name: favoritesList.name,
+                                    documents: favoritesList.documents,
+                                }),
+                            );
+                        }
+                    }
+                } else {
+                    this.store.dispatch(StartActions.setTreeView({ documents: this._selected }));
+                }
+            }),
+        );
+    }
+
     public addEndpoint(): Observable<void> {
         return this.auth.ensureAuthorized('editor').pipe(
             mergeMap(() => this.api.getEndpoints()),
@@ -284,26 +278,28 @@ export class StartComponent implements OnDestroy, AfterViewInit {
             return EMPTY;
         }
 
-        if (!this._currentFavorites) {
-            return this.auth.ensureAuthorized('editor').pipe(
-                map(() =>
-                    this.window.confirm(
-                        stringFormat(
-                            this.translate.instant('CONFIRM_DELETE_DOCUMENT'),
-                            this._selected.map(item => item.idShort).join(', '),
+        return this.currentFavorites.pipe(
+            first(),
+            mergeMap(currentFavorites => {
+                if (currentFavorites) {
+                    this.favorites.remove(this._selected, currentFavorites);
+                    this.store.dispatch(StartActions.removeFavorites({ favorites: [...this._selected] }));
+                    return of(void 0);
+                } else {
+                    return this.auth.ensureAuthorized('editor').pipe(
+                        map(() =>
+                            this.window.confirm(
+                                stringFormat(
+                                    this.translate.instant('CONFIRM_DELETE_DOCUMENT'),
+                                    this._selected.map(item => item.idShort).join(', '),
+                                ),
+                            ),
                         ),
-                    ),
-                ),
-                mergeMap(result => from(result ? this._selected : [])),
-                mergeMap(document => this.api.delete(document.id, document.endpoint)),
-                catchError(error => this.notify.error(error)),
-            );
-        }
-
-        return of(this._currentFavorites).pipe(
-            map(list => {
-                this.favorites.remove(this._selected, list);
-                this.store.dispatch(StartActions.removeFavorites({ favorites: [...this._selected] }));
+                        mergeMap(result => from(result ? this._selected : [])),
+                        mergeMap(document => this.api.delete(document.id, document.endpoint)),
+                        catchError(error => this.notify.error(error)),
+                    );
+                }
             }),
         );
     }
@@ -373,8 +369,8 @@ export class StartComponent implements OnDestroy, AfterViewInit {
         }
     }
 
-    public setLimit(limit: number): void {
-        this.store.dispatch(StartActions.getFirstPage({ limit }));
+    public setLimit(value: string | number): void {
+        this.store.dispatch(StartActions.getFirstPage({ limit: Number(value) }));
     }
 
     public firstPage(): void {
diff --git a/projects/aas-portal/src/assets/i18n/de-de.json b/projects/aas-portal/src/assets/i18n/de-de.json
index 1826ebdf..8ea3af01 100644
--- a/projects/aas-portal/src/assets/i18n/de-de.json
+++ b/projects/aas-portal/src/assets/i18n/de-de.json
@@ -51,6 +51,7 @@
     "CMD_DELETE_USER": "Benutzerkonto löschen...",
     "CMD_VIEW_USER_FEEDBACK": "Nutzer-Feedback",
     "CMD_VIEW_NAMEPLATE": "Typenschild",
+    "CMD_ADD_NEW_FAVORITES_LIST": "Neue Favoritenliste",
     "COLUMN_VARIANT": "Variante",
     "COLUMN_NAME": "Name",
     "COLUMN_MODEL_TYPE": "Modeltyp",
@@ -165,6 +166,8 @@
     "OPTION_TIMELINE_CHART": "Zeitdiagramm",
     "OPTION_BAR_VERTICAL_CHART": "Balkendiagramm vertikal",
     "OPTION_BAR_HORIZONTAL_CHART": "Balkendiagramm horizontal",
+    "TEXT_ADD_FAVORITE": "1 Favorit hinzufügen",
+    "TEXT_ADD_FAVORITES": "{0} Favoriten hinzufügen",
     "AASEndpointType": {
         "FileSystem": "Verzeichnis",
         "AASServer": "AAS-Server",
diff --git a/projects/aas-portal/src/assets/i18n/en-us.json b/projects/aas-portal/src/assets/i18n/en-us.json
index 8f631932..e055aa0b 100644
--- a/projects/aas-portal/src/assets/i18n/en-us.json
+++ b/projects/aas-portal/src/assets/i18n/en-us.json
@@ -51,6 +51,7 @@
     "CMD_DELETE_USER": "Delete user account...",
     "CMD_VIEW_USER_FEEDBACK": "User feedback",
     "CMD_VIEW_NAMEPLATE": "Nameplate",
+    "CMD_ADD_NEW_FAVORITES_LIST": "New favorites list",
     "COLUMN_NAME": "Name",
     "COLUMN_MODEL_TYPE": "Model type",
     "COLUMN_SIZE": "Size",
@@ -165,6 +166,8 @@
     "OPTION_TIMELINE_CHART": "Timeline chart",
     "OPTION_BAR_VERTICAL_CHART": "Vertical bar chart",
     "OPTION_BAR_HORIZONTAL_CHART": "Horizontal bar chart",
+    "TEXT_ADD_FAVORITE": "Add 1 favorite",
+    "TEXT_ADD_FAVORITES": "Add {0} favorites",
     "AASEndpointType": {
         "FileSystem": "File system",
         "AASServer": "AAS server",
diff --git a/projects/aas-portal/src/test/start/remove-endpoint-form.component.spec.ts b/projects/aas-portal/src/test/start/remove-endpoint-form.component.spec.ts
index bc051de8..1baf66a0 100644
--- a/projects/aas-portal/src/test/start/remove-endpoint-form.component.spec.ts
+++ b/projects/aas-portal/src/test/start/remove-endpoint-form.component.spec.ts
@@ -14,22 +14,16 @@ import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-tran
 
 import { RemoveEndpointFormComponent } from '../../app/start/remove-endpoint-form/remove-endpoint-form.component';
 
-
 describe('RemoveEndpointFormComponent', () => {
     let component: RemoveEndpointFormComponent;
     let fixture: ComponentFixture<RemoveEndpointFormComponent>;
-    let submitButton: HTMLButtonElement;
     let modal: NgbActiveModal;
     let form: HTMLFormElement;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [
-                RemoveEndpointFormComponent
-            ],
-            providers: [
-                NgbActiveModal
-            ],
+            declarations: [RemoveEndpointFormComponent],
+            providers: [NgbActiveModal],
             imports: [
                 CommonModule,
                 FormsModule,
@@ -37,11 +31,10 @@ describe('RemoveEndpointFormComponent', () => {
                 TranslateModule.forRoot({
                     loader: {
                         provide: TranslateLoader,
-                        useClass: TranslateFakeLoader
-                    }
-                })
-
-            ]
+                        useClass: TranslateFakeLoader,
+                    },
+                }),
+            ],
         });
 
         fixture = TestBed.createComponent(RemoveEndpointFormComponent);
@@ -49,14 +42,13 @@ describe('RemoveEndpointFormComponent', () => {
         component.endpoints = [
             { name: 'Samples', url: 'http://localhost:1234', selected: false },
             { name: 'I4AAS Server', url: 'http://localhost:1235', selected: false },
-            { name: 'AAS Registry', url: 'http://localhost:1236', selected: false }
+            { name: 'AAS Registry', url: 'http://localhost:1236', selected: false },
         ];
 
         fixture.detectChanges();
 
         modal = TestBed.inject(NgbActiveModal);
         form = fixture.debugElement.nativeElement.querySelector('form');
-        submitButton = fixture.debugElement.nativeElement.querySelector('button[type="submit"]');
     });
 
     it('should create', () => {
@@ -78,10 +70,10 @@ describe('RemoveEndpointFormComponent', () => {
         expect(modal.close).toHaveBeenCalled();
     });
 
-    it('allows deleting the "Samples" registry', function () {
+    it('?allows deleting the "Samples" registry', function () {
         spyOn(modal, 'close');
         form.dispatchEvent(new Event('submit'));
         expect(modal.close).toHaveBeenCalledTimes(0);
         expect(component.messages.length > 0).toBeTrue();
     });
-});
\ No newline at end of file
+});