diff --git a/frontend/src/lib/components/CategoryModal.svelte b/frontend/src/lib/components/CategoryModal.svelte
index 687e6c7..e28706f 100644
--- a/frontend/src/lib/components/CategoryModal.svelte
+++ b/frontend/src/lib/components/CategoryModal.svelte
@@ -6,14 +6,14 @@
 	let modal: HTMLDialogElement;
 	import { t } from 'svelte-i18n';
 
-	import InformationSlabCircle from '~icons/mdi/information-slab-circle';
-
 	export let categories: Category[] = [];
 
 	let category_to_edit: Category | null = null;
 
 	let is_changed: boolean = false;
 
+	let has_loaded: boolean = false;
+
 	onMount(async () => {
 		modal = document.getElementById('my_modal_1') as HTMLDialogElement;
 		if (modal) {
@@ -21,6 +21,7 @@
 		}
 		let category_fetch = await fetch('/api/categories/categories');
 		categories = await category_fetch.json();
+		has_loaded = true;
 		// remove the general category if it exists
 		// categories = categories.filter((c) => c.name !== 'general');
 	});
@@ -77,25 +78,31 @@
 	<div class="modal-box" role="dialog" on:keydown={handleKeydown} tabindex="0">
 		<h3 class="font-bold text-lg">{$t('categories.manage_categories')}</h3>
 
-		{#each categories as category}
-			<div class="flex justify-between items-center mt-2">
-				<span>{category.display_name} {category.icon}</span>
-				<div class="flex space-x-2">
-					<button on:click={() => (category_to_edit = category)} class="btn btn-primary btn-sm"
-						>Edit</button
-					>
-					{#if category.name != 'general'}
-						<button on:click={removeCategory(category)} class="btn btn-warning btn-sm"
-							>{$t('adventures.remove')}</button
+		{#if has_loaded}
+			{#each categories as category}
+				<div class="flex justify-between items-center mt-2">
+					<span>{category.display_name} {category.icon}</span>
+					<div class="flex space-x-2">
+						<button on:click={() => (category_to_edit = category)} class="btn btn-primary btn-sm"
+							>Edit</button
 						>
-					{:else}
-						<button class="btn btn-warning btn-sm btn-disabled">{$t('adventures.remove')}</button>
-					{/if}
+						{#if category.name != 'general'}
+							<button on:click={removeCategory(category)} class="btn btn-warning btn-sm"
+								>{$t('adventures.remove')}</button
+							>
+						{:else}
+							<button class="btn btn-warning btn-sm btn-disabled">{$t('adventures.remove')}</button>
+						{/if}
+					</div>
 				</div>
+			{/each}
+			{#if categories.length === 0}
+				<p>{$t('categories.no_categories_found')}</p>
+			{/if}
+		{:else}
+			<div class="flex items-center justify-center">
+				<span class="loading loading-spinner loading-lg m-4"></span>
 			</div>
-		{/each}
-		{#if categories.length === 0}
-			<p>{$t('categories.no_categories_found')}</p>
 		{/if}
 
 		{#if category_to_edit}
diff --git a/frontend/src/routes/activities/+page.server.ts b/frontend/src/routes/activities/+page.server.ts
deleted file mode 100644
index 626bef8..0000000
--- a/frontend/src/routes/activities/+page.server.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { redirect, type Actions } from '@sveltejs/kit';
-import type { PageServerLoad } from './$types';
-import { fetchCSRFToken } from '$lib/index.server';
-const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL'];
-const endpoint = PUBLIC_SERVER_URL || 'http://localhost:8000';
-
-export const load = (async (event) => {
-	if (!event.locals.user) {
-		return redirect(302, '/login');
-	}
-	let csrfToken = await fetchCSRFToken();
-	let allActivities: string[] = [];
-	let res = await event.fetch(`${endpoint}/api/activity-types/types/`, {
-		headers: {
-			'X-CSRFToken': csrfToken,
-			Cookie: `csrftoken=${csrfToken}`
-		},
-		credentials: 'include'
-	});
-	console.log(res);
-	let data = await res.json();
-	if (data) {
-		allActivities = data;
-	}
-	return {
-		props: {
-			activities: allActivities
-		}
-	};
-}) satisfies PageServerLoad;
-
-export const actions: Actions = {
-	getActivities: async (event) => {
-		let csrfToken = await fetchCSRFToken();
-		let allActivities: string[] = [];
-		let res = await fetch(`${endpoint}/api/activity-types/types/`, {
-			headers: {
-				'X-CSRFToken': csrfToken,
-				'Content-Type': 'application/json',
-				Cookie: `csrftoken=${csrfToken}`,
-				Referer: event.url.origin // Include Referer header
-			}
-		});
-		console.log(res);
-		let data = await res.json();
-		if (data) {
-			allActivities = data;
-		}
-		return { activities: allActivities };
-	}
-};
diff --git a/frontend/src/routes/activities/+page.svelte b/frontend/src/routes/activities/+page.svelte
deleted file mode 100644
index 89aa22c..0000000
--- a/frontend/src/routes/activities/+page.svelte
+++ /dev/null
@@ -1,38 +0,0 @@
-<script lang="ts">
-	import { goto } from '$app/navigation';
-	import type { PageData } from './$types';
-	import { t } from 'svelte-i18n';
-
-	export let data: PageData;
-
-	let activities: string[] = data.props.activities;
-</script>
-
-<!-- make a table with pinned rows -->
-<table class="table table-compact">
-	<thead>
-		<tr>
-			<th>{$t('navbar.tag')}</th>
-			<th>{$t('adventures.actions')}</th>
-		</tr>
-	</thead>
-	<tbody>
-		{#each activities as activity}
-			<tr>
-				<td>{activity}</td>
-				<td>
-					<button
-						class="btn btn-sm btn-primary"
-						on:click={() => goto(`/search?query=${activity}&property=activity_types`)}
-						>{$t('adventures.see_adventures')}</button
-					>
-				</td>
-			</tr>
-		{/each}
-	</tbody>
-</table>
-
-<svelte:head>
-	<title>My Tags</title>
-	<meta name="description" content="View my tags." />
-</svelte:head>
diff --git a/frontend/src/routes/adventures/[id]/+page.svelte b/frontend/src/routes/adventures/[id]/+page.svelte
index 90fc283..89bc328 100644
--- a/frontend/src/routes/adventures/[id]/+page.svelte
+++ b/frontend/src/routes/adventures/[id]/+page.svelte
@@ -58,8 +58,6 @@
 					console.error(`Error processing GPX file ${gpxfile}:`, error);
 				}
 			}
-
-			// Log the final GeoJSON for debugging
 		}
 	}