diff --git a/src/app.css b/src/app.css
index 3240407..5d8c69b 100644
--- a/src/app.css
+++ b/src/app.css
@@ -40,7 +40,7 @@
     --warning: oklch(0.84 0.16 84);
     --error: oklch(0.577 0.245 27.325);
     --positive: oklch(0.5 0.2067 147.18);
-    --edit: oklch(0.5852 0.2263 260.47);
+    --action: oklch(0.5852 0.2263 260.47);
 }
 
 .dark {
@@ -78,7 +78,7 @@
     --warning: oklch(0.84 0.16 84);
     --error: oklch(0.704 0.191 22.216);
     --positive: oklch(0.7522 0.2067 147.18);
-    --edit: oklch(0.6098 0.1872 260.47);
+    --action: oklch(0.6098 0.1872 260.47);
 }
 
 @theme inline {
@@ -120,7 +120,7 @@
     --color-warning: var(--warning);
     --color-error: var(--error);
     --color-positive: var(--positive);
-    --color-edit: var(--edit);
+    --color-action: var(--action);
 }
 
 @layer base {
diff --git a/src/lib/components/custom/claim-item-dialog.svelte b/src/lib/components/custom/claim-item-dialog.svelte
index a255926..3e0912b 100644
--- a/src/lib/components/custom/claim-item-dialog.svelte
+++ b/src/lib/components/custom/claim-item-dialog.svelte
@@ -23,7 +23,7 @@
 			</Dialog.Description>
 		</Dialog.Header>
 
-		<form method="post" action="?/inquire">
+		<form method="post" action="?/claim">
 			<Field.Group>
 				<div class="flex gap-4">
 
diff --git a/src/lib/components/custom/edit-item-dialog.svelte b/src/lib/components/custom/edit-item-dialog.svelte
index f4d9d87..8ade4c6 100644
--- a/src/lib/components/custom/edit-item-dialog.svelte
+++ b/src/lib/components/custom/edit-item-dialog.svelte
@@ -6,7 +6,7 @@
 	import { Label } from '$lib/components/ui/label';
 	import * as Field from '$lib/components/ui/field';
 	import { Separator } from '$lib/components/ui/separator';
-
+	import TrashIcon from '@lucide/svelte/icons/trash';
 	import ImageUpload from '$lib/components/custom/image-upload/image-upload.svelte';
 	import { genDescription } from '$lib/db/items.remote';
 	import { EMAIL_REGEX_STRING } from '$lib/consts';
@@ -14,6 +14,9 @@
 	import { Textarea } from '$lib/components/ui/textarea';
 	import * as Card from '$lib/components/ui/card';
 	import { dateFormatOptions } from '$lib/shared';
+	import { Badge } from '$lib/components/ui/badge';
+	import { deleteInquiry } from '$lib/db/inquiries.remote';
+	import { invalidateAll } from '$app/navigation';
 
 	let { open = $bindable(), item = $bindable() }: { open: boolean, item: Item | undefined } = $props();
 
@@ -32,7 +35,7 @@
 </script>
 
 <Dialog.Root bind:open>
-	<Dialog.Content class="max-w-[calc(100%-2rem)] md:max-w-3xl">
+	<Dialog.Content class={item?.threads ? 'max-w-[calc(100%-2rem)] md:max-w-3xl' : ''}>
 		<Dialog.Header>
 			<Dialog.Title>Manage Item</Dialog.Title>
 			<Dialog.Description>
@@ -122,16 +125,30 @@
 
 					<h2 class="text-lg leading-none font-semibold">Item inquiries:</h2>
 					{#each item.threads as thread (thread)}
-						<a href="/items/{item.id}/inquiries/{thread.id}" class="mt-4">
 
-							<Card.Root>
-								<Card.Header>
-									<Card.Title>Date</Card.Title>
-									<Card.Content>Inquirer: {thread.messages[0].body}
-									</Card.Content>
-								</Card.Header>
-							</Card.Root>
-						</a>
+						<Card.Root class="mt-4">
+							<Card.Header>
+								<Card.Title>{thread.createdAt.toLocaleDateString('en-US', dateFormatOptions)}
+									<!--{#if thread.messages[thread.messages.length - 1].sender === 'inquirer'}-->
+									<!--	t-->
+									<!--{/if}-->
+								</Card.Title>
+								<Card.Description
+								>{thread.messages[0].body}
+								</Card.Description
+								>
+
+								<Card.Action class="items-center flex gap-2">
+									<a href="/items/{item.id}/inquiries/{thread.id}"
+										 class="{buttonVariants({variant: 'ghost'})} text-action">Reply?</a>
+									<Button variant="ghost" class="text-destructive"
+													onclick={() => {deleteInquiry(thread.id); invalidateAll();}}>
+										<TrashIcon />
+									</Button>
+								</Card.Action>
+
+							</Card.Header>
+						</Card.Root>
 					{/each}
 				</div>
 			{/if}
diff --git a/src/lib/components/custom/inquire-item-dialog.svelte b/src/lib/components/custom/inquire-item-dialog.svelte
index 05855cf..26c8534 100644
--- a/src/lib/components/custom/inquire-item-dialog.svelte
+++ b/src/lib/components/custom/inquire-item-dialog.svelte
@@ -12,6 +12,7 @@
 
 
 	let { open = $bindable(), item }: { open: boolean, item: Item | undefined } = $props();
+
 </script>
 
 <Dialog.Root bind:open>
@@ -23,7 +24,7 @@
 			</Dialog.Description>
 		</Dialog.Header>
 
-		<form method="post" action="?/inquire">
+		<form method="post" action={'?/inquire&id=' + item?.id}>
 			<Field.Group>
 				<div class="flex gap-4">
 
@@ -53,7 +54,7 @@
 				</div>
 
 				<Field.Field>
-					<Field.Label for="description">
+					<Field.Label for="inquiry">
 						Please describe your inquiry <span class="text-error">*</span>
 					</Field.Label>
 					<Input
diff --git a/src/lib/components/custom/item-listing.svelte b/src/lib/components/custom/item-listing.svelte
index 701689a..98c54c9 100644
--- a/src/lib/components/custom/item-listing.svelte
+++ b/src/lib/components/custom/item-listing.svelte
@@ -98,7 +98,7 @@
 						Deny
 					</Button>
 				{/if}
-				<Button variant="ghost" class="text-edit"
+				<Button variant="ghost" class="text-action"
 								onclick={() => {editCallback(item)}}>
 					<PencilIcon />
 					Manage
@@ -107,7 +107,7 @@
 			</div>
 		{:else}
 			<div class="mt-2 justify-between flex">
-				<Button variant="ghost" class="text-edit"
+				<Button variant="ghost" class="text-action"
 								onclick={() => {inquireCallback(item)}}>
 					<NotebookPenIcon />
 					Inquire
diff --git a/src/lib/components/custom/submit-item-dialog.svelte b/src/lib/components/custom/submit-item-dialog.svelte
index 39048cf..548b8ac 100644
--- a/src/lib/components/custom/submit-item-dialog.svelte
+++ b/src/lib/components/custom/submit-item-dialog.svelte
@@ -34,7 +34,7 @@
 			</Dialog.Description>
 		</Dialog.Header>
 
-		<form method="post" action="?/create" enctype="multipart/form-data">
+		<form method="post" action="/items?/create" enctype="multipart/form-data">
 			<Field.Group>
 				<ImageUpload onSelect={onSelect} required />
 
diff --git a/src/lib/consts.ts b/src/lib/consts.ts
index c78747b..698219c 100644
--- a/src/lib/consts.ts
+++ b/src/lib/consts.ts
@@ -22,7 +22,7 @@ export const EXPIRE_REMINDER_DAYS = 30;
 // 	/(?:[a-z0-9!#$%&'*+\/=?^`\{-\}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`\{-\}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/;
 
 const EMAIL_REGEX =
-	/^(?!\.)(?!.*\.\.)([a-z0-9_'+\-.]*)[a-z0-9_'+-]@([a-z0-9][a-z0-9-]*\.)+[a-z]{2,}$/i;
+	/^(?!\.)(?!.*\.\.)([a-z0-9_'+\-\.]*)[a-z0-9_'+\-]@([a-z0-9][a-z0-9\-]*\.)+[a-z]{2,}$/i;
 
 // Replace single quote with HTML entity or remove it from the character class
 export const EMAIL_REGEX_STRING = EMAIL_REGEX.source.replace(/'/g, '&#39;');
diff --git a/src/lib/db/inquiries.remote.ts b/src/lib/db/inquiries.remote.ts
new file mode 100644
index 0000000..7f95f10
--- /dev/null
+++ b/src/lib/db/inquiries.remote.ts
@@ -0,0 +1,11 @@
+import { getRequestEvent, query } from '$app/server';
+import * as v from 'valibot';
+import sql from '$lib/db/db.server';
+import { verifyJWT } from '$lib/auth/index.server';
+
+export const deleteInquiry = query(v.number(), async (id) => {
+	const { cookies } = getRequestEvent();
+	verifyJWT(cookies);
+
+	await sql`DELETE FROM inquiry_threads WHERE id = ${id};`;
+});
diff --git a/src/lib/db/items.remote.ts b/src/lib/db/items.remote.ts
index d134821..fea83be 100644
--- a/src/lib/db/items.remote.ts
+++ b/src/lib/db/items.remote.ts
@@ -1,4 +1,4 @@
-import { getRequestEvent, query } from '$app/server';
+import { command, getRequestEvent, query } from '$app/server';
 import * as v from 'valibot';
 import sql from '$lib/db/db.server';
 import { verifyJWT } from '$lib/auth/index.server';
@@ -9,7 +9,7 @@ export const genDescription = query(async () => {
 	return 'A matte black water bottle with a black lid and a "BKLYN BENTO" logo on the side, resting on a tree trunk in a forest.';
 });
 
-export const approveDenyItem = query(
+export const approveDenyItem = command(
 	v.object({ id: v.number(), approved: v.boolean() }),
 	async ({ id, approved }) => {
 		const { cookies } = getRequestEvent();
diff --git a/src/routes/items/+page.server.ts b/src/routes/items/+page.server.ts
index ace5488..5b2d8f8 100644
--- a/src/routes/items/+page.server.ts
+++ b/src/routes/items/+page.server.ts
@@ -5,8 +5,6 @@ import sql from '$lib/db/db.server';
 import sharp from 'sharp';
 import { writeFileSync } from 'node:fs';
 import type { Item } from '$lib/types/item.server';
-import type { Message } from '$lib/types/inquiries.server';
-import { Sender } from '$lib/types/inquiries.server';
 import { getFormString, getRequiredFormString } from '$lib/shared';
 
 export const load: PageServerLoad = async ({ url, locals }) => {
@@ -15,59 +13,92 @@ export const load: PageServerLoad = async ({ url, locals }) => {
 	// If the user is logged in, fetch items together with their threads (each thread contains its first message)
 	if (locals && locals.user) {
 		try {
-			type DBMessage = {
-				id: number;
-				sender: keyof typeof Sender | string;
-				body: string;
-				createdAt: string;
-			};
-			type DBThread = { id: number; messages: DBMessage[] };
-			type RowsItem = { threads: DBThread[]; [key: string]: unknown };
-
-			const rows = (await sql`
-                SELECT i.*, COALESCE(
-                    (
-                        SELECT json_agg(json_build_object('id', t.id, 'messages', json_build_array(json_build_object('id', m.id, 'sender', m.sender, 'body', m.body, 'createdAt', m.created_at))) ORDER BY t.id)
-                        FROM inquiry_threads t
-                        LEFT JOIN LATERAL (
-                            SELECT id, sender, body, created_at
-                            FROM inquiry_messages
-                            WHERE thread_id = t.id
-                            ORDER BY created_at ASC
-                            LIMIT 1
-                        ) m ON true
-                        WHERE t.item_id = i.id
-                    ), '[]'::json
-                ) AS threads
-                FROM items i
-                ${
-									searchQuery
-										? sql`WHERE word_similarity(${searchQuery}, i.description) > 0.3
-                ORDER BY word_similarity(${searchQuery}, i.description)`
-										: sql``
-								};
-            `) as RowsItem[];
-
-			// `rows` contains items with a `threads` JSON column. Attach parsed threads to each item.
-			const items: Item[] = rows.map((r) => {
-				const item: Record<string, unknown> = { ...r };
-				const rawThreads = (r.threads || []) as DBThread[];
-				item.threads = rawThreads.map((t) => ({
-					id: t.id,
-					messages: (t.messages || []).map((m) => ({
-						id: m.id,
-						// coerce sender to our Sender enum type if possible
-						sender: (Object.values(Sender).includes(m.sender as Sender)
-							? (m.sender as Sender)
-							: (m.sender as unknown)) as Message['sender'],
-						body: m.body,
-						createdAt: new Date(m.createdAt)
-					}))
-				}));
-				return item as unknown as Item;
-			});
+			const items: Item[] = await sql`
+				SELECT
+					i.*,
+					json_agg(
+					jsonb_build_object(
+						'id', t.id,
+						'item_id', t.item_id,
+						'created_at', t.created_at,
+						'messages', m.messages
+					)
+									) FILTER (WHERE t.id IS NOT NULL) AS threads
+				FROM items i
+							 LEFT JOIN inquiry_threads t
+												 ON t.item_id = i.id
+							 LEFT JOIN LATERAL (
+					SELECT
+						json_agg(im.* ORDER BY im.created_at) AS messages
+					FROM inquiry_messages im
+					WHERE im.thread_id = t.id
+					) m ON TRUE
+				GROUP BY i.id;
+			`;
+			items.forEach((item) =>
+				item.threads?.forEach((thread) => (thread.createdAt = new Date(thread.createdAt)))
+			);
 
 			return { items };
+
+			// type DBMessage = {
+			// 	id: number;
+			// 	sender: keyof typeof Sender | string;
+			// 	body: string;
+			// 	createdAt: string;
+			// };
+			// type DBThread = { id: number; messages: DBMessage[] };
+			// type RowsItem = { threads: DBThread[]; [key: string]: unknown };
+			//
+			// const rows = (await sql`
+			//           SELECT i.*, COALESCE(
+			//               (
+			//                   SELECT json_agg(json_build_object('id', t.id, 'messages', json_build_array(json_build_object('id', m.id, 'sender', m.sender, 'body', m.body, 'createdAt', m.created_at))), 'createdAt' , t.created_at ORDER BY t.id)
+			//                   FROM inquiry_threads t
+			//                   LEFT JOIN LATERAL (
+			//                       SELECT id, sender, body, created_at
+			//                       FROM inquiry_messages
+			//                       WHERE thread_id = t.id
+			//                       ORDER BY created_at ASC
+			//                       LIMIT 1
+			//                   ) m ON true
+			//                   WHERE t.item_id = i.id
+			//               ), '[]'::json
+			//           ) AS threads
+			//           FROM items i
+			//           ${
+			// 						searchQuery
+			// 							? sql`WHERE word_similarity(${searchQuery}, i.description) > 0.3
+			//           ORDER BY word_similarity(${searchQuery}, i.description)`
+			// 							: sql``
+			// 					};
+			//       `) as RowsItem[];
+			//
+			// // `rows` contains items with a `threads` JSON column. Attach parsed threads to each item.
+			// const items: Item[] = rows.map((r) => {
+			// 	const item: Record<string, unknown> = { ...r };
+			// 	const rawThreads = (r.threads || []) as DBThread[];
+			// 	console.log(rawThreads);
+			// 	if (rawThreads.length === 0) {
+			// 		item.threads = null;
+			// 	} else {
+			// 		item.threads = rawThreads.map((t) => ({
+			// 			id: t.id,
+			// 			messages: (t.messages || []).map((m) => ({
+			// 				id: m.id,
+			// 				// coerce sender to our Sender enum type if possible
+			// 				sender: (Object.values(Sender).includes(m.sender as Sender)
+			// 					? (m.sender as Sender)
+			// 					: (m.sender as unknown)) as Message['sender'],
+			// 				body: m.body,
+			// 				createdAt: new Date(m.createdAt)
+			// 			}))
+			// 		}));
+			// 	}
+			// 	return item as unknown as Item;
+			// });
+			//
+			// return { items };
 		} catch (err) {
 			console.error('Failed to load items with threads:', err);
 			// Fallback to non-joined fetch so the page still loads
@@ -128,7 +159,10 @@ export const actions: Actions = {
 				const inputBuffer = Buffer.from(await file.arrayBuffer());
 
 				// Detect format (Sharp does this internally)
-				const image = sharp(inputBuffer);
+				const image = sharp(inputBuffer).rotate();
+
+				// image = image.rotate();
+
 				const metadata = await image.metadata();
 
 				if (metadata.format === 'jpeg') {
@@ -137,6 +171,7 @@ export const actions: Actions = {
 				} else {
 					// Convert to JPG
 					outputBuffer = await image
+
 						.jpeg({ quality: 90 }) // adjust if needed
 						.toBuffer();
 				}
@@ -238,7 +273,7 @@ export const actions: Actions = {
 				// Convert File → Buffer
 				const inputBuffer = Buffer.from(await file.arrayBuffer());
 
-				const image = sharp(inputBuffer);
+				const image = sharp(inputBuffer).rotate();
 				const metadata = await image.metadata();
 
 				if (metadata.format === 'jpeg') {
@@ -280,6 +315,7 @@ export const actions: Actions = {
 	inquire: async ({ request, url }) => {
 		const id = url.searchParams.get('id');
 		if (!id) {
+			console.log('No id provided!');
 			return fail(400, { message: 'Missing id!', success: false });
 		}
 
@@ -292,13 +328,21 @@ export const actions: Actions = {
 			inquiry = getRequiredFormString(data, 'inquiry');
 			email = getRequiredFormString(data, 'email');
 
-			const response = sql`
-			WITH new_thread AS (
-				INSERT INTO inquiry_threads (item_id) VALUES (${id})
-				RETURNING id
-			) INSERT INTO inquiry_messages (thread_id, sender, body)
-			VALUES (new_thread.id, 'inquirer', ${inquiry})
-			RETURNING new_thread.id, id;
+			const response = await sql`
+				WITH new_thread AS (
+					INSERT INTO inquiry_threads (item_id, inquirer_email)
+						VALUES (${id}, ${email})
+						RETURNING id
+				)
+				INSERT INTO inquiry_messages (thread_id, sender, body)
+				SELECT
+					id,
+					'inquirer',
+					${inquiry}
+				FROM new_thread
+				RETURNING
+					thread_id,
+					id AS message_id;
 			`;
 		} catch (e) {
 			return fail(400, {
diff --git a/src/routes/login/+page.server.ts b/src/routes/login/+page.server.ts
index 88cf140..e2ba791 100644
--- a/src/routes/login/+page.server.ts
+++ b/src/routes/login/+page.server.ts
@@ -15,6 +15,6 @@ export const actions = {
 		} catch (e) {
 			return fail(400, { message: e instanceof Error ? e.message : 'Unknown error occurred' });
 		}
-		throw redirect(303, '/');
+		throw redirect(303, '/items');
 	}
 } satisfies Actions;