diff --git a/.gitignore b/.gitignore
index 8fd765c..28000b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@ test-results
 node_modules
 config.json
 
+src/lib/data/tatort.db
+
 # Output
 .output
 .vercel
diff --git a/package-lock.json b/package-lock.json
index 9e00d04..cc927f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1479,6 +1479,12 @@
 				"win32"
 			]
 		},
+		"node_modules/@standard-schema/spec": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz",
+			"integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==",
+			"license": "MIT"
+		},
 		"node_modules/@sveltejs/acorn-typescript": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.5.tgz",
@@ -1502,9 +1508,9 @@
 			}
 		},
 		"node_modules/@sveltejs/adapter-node": {
-			"version": "5.2.13",
-			"resolved": "https://registry.npmjs.org/@sveltejs/adapter-node/-/adapter-node-5.2.13.tgz",
-			"integrity": "sha512-yS2TVFmIrxjGhYaV5/iIUrJ3mJl6zjaYn0lBD70vTLnYvJeqf3cjvLXeXCUCuYinhSBoyF4DpfGla49BnIy7sQ==",
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/@sveltejs/adapter-node/-/adapter-node-5.3.1.tgz",
+			"integrity": "sha512-PSoGfa9atkmuixe7jvuS2tsUohVZF20So87ASzfMRGTTNqEd8s48KAodlv3CzHwq9XO/BM8KsQLpqqsr/6dmuA==",
 			"license": "MIT",
 			"dependencies": {
 				"@rollup/plugin-commonjs": "^28.0.1",
@@ -1517,16 +1523,17 @@
 			}
 		},
 		"node_modules/@sveltejs/kit": {
-			"version": "2.26.0",
-			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.26.0.tgz",
-			"integrity": "sha512-TUxMYoK6Yim4uRIW0L7TXtlEtyLchy90PmInI7d1lPAPMchkBEvN3nVMkn5iTMUobxdLE5nR/YEU/4aYqezMuQ==",
+			"version": "2.37.0",
+			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.37.0.tgz",
+			"integrity": "sha512-xgKtpjQ6Ry4mdShd01ht5AODUsW7+K1iValPDq7QX8zI1hWOKREH9GjG8SRCN5tC4K7UXmMhuQam7gbLByVcnw==",
 			"license": "MIT",
 			"dependencies": {
+				"@standard-schema/spec": "^1.0.0",
 				"@sveltejs/acorn-typescript": "^1.0.5",
 				"@types/cookie": "^0.6.0",
 				"acorn": "^8.14.1",
 				"cookie": "^0.6.0",
-				"devalue": "^5.1.0",
+				"devalue": "^5.3.2",
 				"esm-env": "^1.2.2",
 				"kleur": "^4.1.5",
 				"magic-string": "^0.30.5",
@@ -1542,9 +1549,15 @@
 				"node": ">=18.13"
 			},
 			"peerDependencies": {
+				"@opentelemetry/api": "^1.0.0",
 				"@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0",
 				"svelte": "^4.0.0 || ^5.0.0-next.0",
 				"vite": "^5.0.3 || ^6.0.0 || ^7.0.0-beta.0"
+			},
+			"peerDependenciesMeta": {
+				"@opentelemetry/api": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/@sveltejs/vite-plugin-svelte": {
@@ -3139,9 +3152,9 @@
 			}
 		},
 		"node_modules/devalue": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.1.1.tgz",
-			"integrity": "sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw==",
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.3.2.tgz",
+			"integrity": "sha512-UDsjUbpQn9kvm68slnrs+mfxwFkIflOhkanmyabZ8zOYk8SMEIbJ3TK+88g70hSIeytu4y18f0z/hYHMTrXIWw==",
 			"license": "MIT"
 		},
 		"node_modules/didyoumean": {
diff --git a/src/lib/components/EmptyList.svelte b/src/lib/components/EmptyList.svelte
new file mode 100644
index 0000000..121f6ec
--- /dev/null
+++ b/src/lib/components/EmptyList.svelte
@@ -0,0 +1 @@
+<p class="flex justify-center m-4">In dieser Liste sind keine Einträge vorhanden</p>
diff --git a/src/lib/data/tatort.db b/src/lib/data/tatort.db
new file mode 100644
index 0000000..79e92c1
Binary files /dev/null and b/src/lib/data/tatort.db differ
diff --git a/src/routes/(angemeldet)/+page.svelte b/src/routes/(angemeldet)/+page.svelte
index 16f5d0a..005c537 100644
--- a/src/routes/(angemeldet)/+page.svelte
+++ b/src/routes/(angemeldet)/+page.svelte
@@ -3,7 +3,6 @@
 	import FileRect from '$lib/icons/File-rect.svelte';
 	import ListIcon from '$lib/icons/List-icon.svelte';
 
-
 	export let data;
 	export let outline = true;
 </script>
@@ -20,7 +19,7 @@
 					<ListIcon class=" group-hover:text-indigo-600" />
 				</div>
 				<a href="/list" class="mt-6 block font-semibold text-gray-900">
-					Liste
+					Vorgänge
 					<span class="absolute inset-0"></span>
 				</a>
 				<p class="mt-1 text-gray-600">
@@ -58,4 +57,4 @@
 </div>
 
 <style>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/routes/(angemeldet)/list/+page.svelte b/src/routes/(angemeldet)/list/+page.svelte
index ae96f94..887096d 100644
--- a/src/routes/(angemeldet)/list/+page.svelte
+++ b/src/routes/(angemeldet)/list/+page.svelte
@@ -1,11 +1,14 @@
 <script lang="ts">
 	import Trash from '$lib/icons/Trash.svelte';
 	import Folder from '$lib/icons/Folder.svelte';
+	import EmptyList from '$lib/components/EmptyList.svelte';
 	import type { PageData } from '../$types';
 
+	// let { data } = $props();
 	export let data: PageData;
+	let vorgangList = data.vorgangList;
 
-	const vorgangList = data.vorgangList;
+	let isEmptyList = vorgangList.length === 0;
 
 	async function delete_item(ev: Event) {
 		let delete_item = window.confirm('Bist du sicher?');
@@ -41,34 +44,38 @@
 	</div>
 	<div class="mx-auto flex justify-center max-w-7xl h-full">
 		<ul role="list" class="divide-y divide-gray-100">
-			{#each vorgangList as vorgangItem}
-				<li>
-					<a
-						href="/list/{vorgangItem.vorgangToken}?pin={vorgangItem.vorgangPIN}"
-						class="flex justify-between gap-x-6 py-5"
-					>
-						<div class="flex gap-x-4">
-							<Folder />
-							<div class="min-w-0 flex-auto">
-								<span class="text-sm font-semibold leading-6 text-gray-900"
-									>{vorgangItem.vorgangName}</span
-								>
-								<button
-									style="padding: 2px"
-									id="del__{vorgangItem.vorgangToken}"
-									on:click|preventDefault={delete_item}
-									aria-label="Vorgang {vorgangItem.name} löschen"
-								>
-									<Trash />
-								</button>
+			{#if isEmptyList}
+				<EmptyList></EmptyList>
+			{:else}
+				{#each vorgangList as vorgangItem}
+					<li>
+						<a
+							href="/list/{vorgangItem.vorgangToken}?pin={vorgangItem.vorgangPIN}"
+							class="flex justify-between gap-x-6 py-5"
+						>
+							<div class="flex gap-x-4">
+								<Folder />
+								<div class="min-w-0 flex-auto">
+									<span class="text-sm font-semibold leading-6 text-gray-900"
+										>{vorgangItem.vorgangName}</span
+									>
+									<button
+										style="padding: 2px"
+										id="del__{vorgangItem.vorgangToken}"
+										on:click|preventDefault={delete_item}
+										aria-label="Vorgang {vorgangItem.name} löschen"
+									>
+										<Trash />
+									</button>
+								</div>
 							</div>
-						</div>
-						<div class="hidden sm:flex sm:flex-col sm:items-end">
-							<p class="text-sm leading-6 text-gray-900">Vorgang</p>
-						</div>
-					</a>
-				</li>
-			{/each}
+							<div class="hidden sm:flex sm:flex-col sm:items-end">
+								<p class="text-sm leading-6 text-gray-900">Vorgang</p>
+							</div>
+						</a>
+					</li>
+				{/each}
+			{/if}
 		</ul>
 	</div>
 </div>
diff --git a/src/routes/(angemeldet)/list/+page.ts b/src/routes/(angemeldet)/list/+page.ts
new file mode 100644
index 0000000..4b9f323
--- /dev/null
+++ b/src/routes/(angemeldet)/list/+page.ts
@@ -0,0 +1,12 @@
+
+
+// export async function load({fetch}){
+//     const  vorgangResponse = await fetch(`/api/list`);
+//      const vorgangList = await vorgangResponse.json();
+
+//      return {
+
+//       vorgangList,
+
+//      }
+// }
diff --git a/src/routes/(token-based)/list/[vorgang]/+page.svelte b/src/routes/(token-based)/list/[vorgang]/+page.svelte
index c465e73..b825977 100644
--- a/src/routes/(token-based)/list/[vorgang]/+page.svelte
+++ b/src/routes/(token-based)/list/[vorgang]/+page.svelte
@@ -11,11 +11,11 @@
 	import Cube from '$lib/icons/Cube.svelte';
 	import { invalidate, invalidateAll } from '$app/navigation';
 	import NameItemEditor from '$lib/components/NameItemEditor.svelte';
+	import EmptyList from '$lib/components/EmptyList.svelte';
 
 	//Seite für die Tatort-Liste
 	let { data } = $props();
 
-	console.log('tatorte: debug ', data);
 	interface ListItem {
 		//sollte Typ Vorgang sein, aber der einfachheit ist es noch ListItem, damit die Komponente NameItemEditor für Vorgang und Tatort eingesetzt werden kann
 		name: string;
@@ -30,6 +30,7 @@
 	let crimesList: ListItem[] = $state(data.crimesList);
 	const vorgangPIN: string = data.vorgang.vorgangPIN;
 	let vorgangToken: string = data.vorgang.vorgangToken;
+	let isEmptyList = $derived(crimesList.length === 0);
 
 	//Variablen für Modal
 	let open = $state(false);
@@ -147,55 +148,61 @@ Mit freundlichen Grüßen,
 
 			{#if admin}
 				Zugangs-PIN: {vorgangPIN}
-				<a class="pt-2 pb-6" href={constructMailToLink()}><Button>Share Link</Button></a>
+				<a class="pt-2 pb-6" href={constructMailToLink()}
+					><Button disabled={isEmptyList}>Share Link</Button></a
+				>
 			{/if}
 		</div>
 		<div class="mx-auto flex justify-center max-w-7xl h-full">
 			<ul class="divide-y divide-gray-100">
-				{#each data.crimesList as item, crimeListItemIndex}
-					<li>
-						<div class=" flex gap-x-4">
-							<a
-								href="/view/{vorgangToken}/{item.name}?pin={vorgangPIN}"
-								class=" flex justify-between gap-x-6 py-5"
-								aria-label="/view/{vorgangToken}/{item.name}?pin={vorgangPIN}"
-								title={item.name}
-							>
-								<Cube />
-							</a>
-							<div class="min-w-0 flex-auto">
-								{#if admin}
-									<NameItemEditor
-										list={data.crimesList}
-										editedName={data.crimeNames[crimeListItemIndex]}
-										currentName={item.name}
-										onSave={handleSave}
-										onDelete={handleDelete}
-									></NameItemEditor>
-								{:else}
-									<span class="text-sm font-semibold leading-6 text-gray-900 inline-block min-w-1"
-										>{item.name}</span
-									>
-								{/if}
-								{#if item.size}
-									<p class="mt-1 truncate text-xs leading-5 text-gray-500">
-										{shortenFileSize(item.size)}
+				{#if isEmptyList}
+					<EmptyList></EmptyList>
+				{:else}
+					{#each data.crimesList as item, crimeListItemIndex}
+						<li>
+							<div class=" flex gap-x-4">
+								<a
+									href="/view/{vorgangToken}/{item.name}?pin={vorgangPIN}"
+									class=" flex justify-between gap-x-6 py-5"
+									aria-label="/view/{vorgangToken}/{item.name}?pin={vorgangPIN}"
+									title={item.name}
+								>
+									<Cube />
+								</a>
+								<div class="min-w-0 flex-auto">
+									{#if admin}
+										<NameItemEditor
+											list={data.crimesList}
+											editedName={data.crimeNames[crimeListItemIndex]}
+											currentName={item.name}
+											onSave={handleSave}
+											onDelete={handleDelete}
+										></NameItemEditor>
+									{:else}
+										<span class="text-sm font-semibold leading-6 text-gray-900 inline-block min-w-1"
+											>{item.name}</span
+										>
+									{/if}
+									{#if item.size}
+										<p class="mt-1 truncate text-xs leading-5 text-gray-500">
+											{shortenFileSize(item.size)}
+										</p>
+									{/if}
+								</div>
+							</div>
+							<div class="hidden sm:flex sm:flex-col sm:items-end">
+								<p class="text-sm leading-6 text-gray-900">3D Tatort</p>
+								{#if item.lastModified}
+									<p class="mt-1 text-xs leading-5 text-gray-500">
+										Zuletzt geändert <time datetime="2023-01-23T13:23Z"
+											>{timeElapsed(new Date(item.lastModified))}</time
+										>
 									</p>
 								{/if}
 							</div>
-						</div>
-						<div class="hidden sm:flex sm:flex-col sm:items-end">
-							<p class="text-sm leading-6 text-gray-900">3D Tatort</p>
-							{#if item.lastModified}
-								<p class="mt-1 text-xs leading-5 text-gray-500">
-									Zuletzt geändert <time datetime="2023-01-23T13:23Z"
-										>{timeElapsed(new Date(item.lastModified))}</time
-									>
-								</p>
-							{/if}
-						</div>
-					</li>
-				{/each}
+						</li>
+					{/each}
+				{/if}
 			</ul>
 		</div>
 
diff --git a/src/routes/(token-based)/list/[vorgang]/+page.ts b/src/routes/(token-based)/list/[vorgang]/+page.ts
index 03ec929..10978e4 100644
--- a/src/routes/(token-based)/list/[vorgang]/+page.ts
+++ b/src/routes/(token-based)/list/[vorgang]/+page.ts
@@ -1,4 +1,3 @@
-import { redirect } from '@sveltejs/kit';
 
 export async function load({fetch, params, url}){
     const  vorgangResponse = await fetch(`/api/list`);
@@ -14,9 +13,7 @@ export async function load({fetch, params, url}){
 	//Variabeln für NameItemEditor
 	const crimeNames: string[] = crimesList.map((l) => l.name);
 
-   if (crimesList.length === 0) {
-    throw redirect(302, '/upload'); // weiterleiten auf die hinzufügen seite
-  }
+
      return {
       vorgang,
       vorgangList,