diff --git a/src/lib/components/finds/CreateFindModal.svelte b/src/lib/components/finds/CreateFindModal.svelte
index ca52678..43ba23d 100644
--- a/src/lib/components/finds/CreateFindModal.svelte
+++ b/src/lib/components/finds/CreateFindModal.svelte
@@ -279,7 +279,6 @@
 		width: 40%;
 		max-width: 600px;
 		min-width: 500px;
-		height: calc(100vh - 100px);
 		backdrop-filter: blur(10px);
 		border-radius: 12px;
 		box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
diff --git a/src/lib/components/finds/EditFindModal.svelte b/src/lib/components/finds/EditFindModal.svelte
index 7bf4b16..4dd296b 100644
--- a/src/lib/components/finds/EditFindModal.svelte
+++ b/src/lib/components/finds/EditFindModal.svelte
@@ -459,7 +459,6 @@
 		width: 40%;
 		max-width: 600px;
 		min-width: 500px;
-		height: calc(100vh - 100px);
 		backdrop-filter: blur(10px);
 		border-radius: 12px;
 		box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
diff --git a/src/lib/components/finds/FindCard.svelte b/src/lib/components/finds/FindCard.svelte
index da22f97..6eded6f 100644
--- a/src/lib/components/finds/FindCard.svelte
+++ b/src/lib/components/finds/FindCard.svelte
@@ -254,6 +254,7 @@
 <style>
 	.find-card {
 		backdrop-filter: blur(10px);
+		margin-top: 1rem;
 		margin-bottom: 1rem;
 	}
 
diff --git a/src/lib/components/locations/LocationFindsModal.svelte b/src/lib/components/locations/LocationFindsModal.svelte
index 4f1e61f..04e0f1e 100644
--- a/src/lib/components/locations/LocationFindsModal.svelte
+++ b/src/lib/components/locations/LocationFindsModal.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
 	import FindsList from '../finds/FindsList.svelte';
 	import { Button } from '$lib/components/button';
+	import { goto } from '$app/navigation';
+	import EditFindModal from '../finds/EditFindModal.svelte';
 
 	interface Find {
 		id: string;
@@ -16,6 +18,8 @@
 		likeCount?: number;
 		isLikedByUser?: boolean;
 		isFromFriend?: boolean;
+		latitude?: string;
+		longitude?: string;
 		media?: Array<{
 			id: string;
 			type: string;
@@ -47,6 +51,8 @@
 	let { isOpen, location, currentUserId, onClose, onCreateFind }: Props = $props();
 
 	let isMobile = $state(false);
+	let showEditModal = $state(false);
+	let findToEdit = $state<Find | null>(null);
 
 	$effect(() => {
 		if (typeof window === 'undefined') return;
@@ -64,6 +70,35 @@
 	function handleCreateFind() {
 		onCreateFind?.();
 	}
+
+	function handleFindExplore(findId: string) {
+		goto(`/finds/${findId}`);
+	}
+
+	function handleFindEdit(findData: any) {
+		const find = location?.finds?.find((f) => f.id === findData.id);
+		if (find) {
+			findToEdit = find;
+			showEditModal = true;
+		}
+	}
+
+	function handleEditModalClose() {
+		showEditModal = false;
+		findToEdit = null;
+	}
+
+	function handleFindUpdated() {
+		showEditModal = false;
+		findToEdit = null;
+		window.location.reload();
+	}
+
+	function handleFindDeleted() {
+		showEditModal = false;
+		findToEdit = null;
+		window.location.reload();
+	}
 </script>
 
 {#if isOpen && location}
@@ -94,12 +129,17 @@
 					<FindsList
 						finds={location.finds.map((find) => ({
 							id: find.id,
+							locationId: find.locationId,
 							title: find.title,
 							description: find.description,
 							category: find.category,
 							locationName: find.locationName,
+							latitude: find.latitude,
+							longitude: find.longitude,
 							isPublic: find.isPublic,
 							userId: find.userId,
+							username: find.username,
+							profilePictureUrl: find.profilePictureUrl,
 							user: {
 								username: find.username,
 								profilePictureUrl: find.profilePictureUrl
@@ -110,6 +150,8 @@
 						}))}
 						hideTitle={true}
 						{currentUserId}
+						onFindExplore={handleFindExplore}
+						onEdit={handleFindEdit}
 					/>
 				{:else}
 					<div class="empty-state">
@@ -147,6 +189,32 @@
 	</div>
 {/if}
 
+{#if showEditModal && findToEdit}
+	<EditFindModal
+		isOpen={showEditModal}
+		find={{
+			id: findToEdit.id,
+			title: findToEdit.title,
+			description: findToEdit.description || null,
+			latitude: findToEdit.latitude || location?.latitude || '0',
+			longitude: findToEdit.longitude || location?.longitude || '0',
+			locationName: findToEdit.locationName || null,
+			category: findToEdit.category || null,
+			isPublic: findToEdit.isPublic ?? 1,
+			media: (findToEdit.media || []).map((m) => ({
+				id: m.id,
+				type: m.type,
+				url: m.url,
+				thumbnailUrl: m.thumbnailUrl || null,
+				orderIndex: m.orderIndex ?? null
+			}))
+		}}
+		onClose={handleEditModalClose}
+		onFindUpdated={handleFindUpdated}
+		onFindDeleted={handleFindDeleted}
+	/>
+{/if}
+
 <style>
 	.modal-container {
 		position: fixed;
@@ -155,7 +223,6 @@
 		width: 40%;
 		max-width: 600px;
 		min-width: 500px;
-		height: calc(100vh - 100px);
 		backdrop-filter: blur(10px);
 		border-radius: 12px;
 		box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
diff --git a/src/lib/components/locations/SelectLocationModal.svelte b/src/lib/components/locations/SelectLocationModal.svelte
index ba56e19..9a10d2d 100644
--- a/src/lib/components/locations/SelectLocationModal.svelte
+++ b/src/lib/components/locations/SelectLocationModal.svelte
@@ -560,7 +560,6 @@
 		width: 40%;
 		max-width: 600px;
 		min-width: 500px;
-		height: calc(100vh - 100px);
 		backdrop-filter: blur(10px);
 		border-radius: 12px;
 		box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 88fd0c5..5b2d45c 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -321,7 +321,6 @@
 		width: 40%;
 		max-width: 1000px;
 		min-width: 500px;
-		height: calc(100vh - 100px);
 		backdrop-filter: blur(10px);
 		border-radius: 12px;
 		box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
diff --git a/src/routes/finds/[findId]/+page.svelte b/src/routes/finds/[findId]/+page.svelte
index 4425cc4..0b5968d 100644
--- a/src/routes/finds/[findId]/+page.svelte
+++ b/src/routes/finds/[findId]/+page.svelte
@@ -457,7 +457,6 @@
 		width: 40%;
 		max-width: 1000px;
 		min-width: 500px;
-		height: calc(100vh - 100px);
 		backdrop-filter: blur(10px);
 		border-radius: 12px;
 		box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);