diff --git a/src/lib/Blog.svelte b/src/lib/Blog.svelte
index 9a7af18..7b12925 100644
--- a/src/lib/Blog.svelte
+++ b/src/lib/Blog.svelte
@@ -26,7 +26,7 @@
 		<SingleRecord {collection} {rkey}>
 			{#snippet child(data)}
 				<div class="text-base-800 dark:text-base-200 text-xs">
-					{new Date(data.value.createdAt || new Date()).toLocaleDateString('en-us', {
+					{new Date(data?.value?.createdAt || new Date()).toLocaleDateString('en-us', {
 						year: 'numeric',
 						month: 'short',
 						day: 'numeric'
diff --git a/src/lib/Website.svelte b/src/lib/Website.svelte
index f6a59f4..b3d084d 100644
--- a/src/lib/Website.svelte
+++ b/src/lib/Website.svelte
@@ -11,6 +11,7 @@
 	import Profile from './Profile.svelte';
 	import Head from './website/Head.svelte';
 	import EditHead from './website/EditHead.svelte';
+	import { parseUri } from './website/data';
 
 	const did = getContext('did');
 </script>
@@ -66,7 +67,7 @@
 			{/snippet}
 		</SingleRecord>
 
-		<div class="relative mt-6 flex flex-col gap-4 group">
+		<div class="group relative mt-6 flex flex-col gap-4">
 			<List collection="dev.flo-bit.blog.entry">
 				{#snippet item(data, deleteItem)}
 					<div class="relative mt-2 flex flex-col gap-2 p-2">
@@ -120,8 +121,7 @@
 								class="absolute top-0 right-0 z-10"
 								size="icon"
 								variant="ghost"
-								href={base + '/blog/' + encodeURIComponent(data.uri) + '/edit'}
-								target="_blank"
+								href={base + '/blog/' + parseUri(data.uri).rkey + '/edit'}
 							>
 								<span class="sr-only">edit</span>
 								<svg
@@ -140,16 +140,15 @@
 							</Button>
 						{:else}
 							<a
-								href={base + '/blog/' + encodeURIComponent(data.uri)}
-								target="_blank"
+								href={base + '/blog/' + parseUri(data.uri).rkey}
 								class="hover:bg-base-200/30 dark:hover:bg-base-800/20 absolute -inset-2 rounded-2xl"
 							>
 								<span class="sr-only">
 									{data.title}
-								</span></a
-							>
+								</span>
+							</a>
 
-							<a class="hidden" href={base + '/blog/' + encodeURIComponent(data.uri) + '/edit'}>
+							<a class="hidden" href={base + '/blog/' + parseUri(data.uri).rkey + '/edit'}>
 								<span class="sr-only">edit</span>
 							</a>
 						{/if}
@@ -179,11 +178,10 @@
 		</div>
 
 		<div class="mt-16 flex flex-col gap-4">
-
 			<SingleRecord collection="dev.flo-bit.about" rkey="self">
 				{#snippet child(data)}
 					<PlainText
-					class="text-base-900 dark:text-base-50 text-xl font-semibold sm:text-2xl"
+						class="text-base-900 dark:text-base-50 text-xl font-semibold sm:text-2xl"
 						key="title"
 						defaultContent="About me"
 						{data}
diff --git a/src/lib/website/EditingWebsiteWrapper.svelte b/src/lib/website/EditingWebsiteWrapper.svelte
index 401c0b0..5c553d9 100644
--- a/src/lib/website/EditingWebsiteWrapper.svelte
+++ b/src/lib/website/EditingWebsiteWrapper.svelte
@@ -2,11 +2,22 @@
 	import { setContext } from 'svelte';
 	import { BlueskyLogin, PopoverEmojiPicker } from '@fuxui/social';
 	import { client, login } from '$lib/oauth/auth.svelte.js';
-	import { Button, Heading, Input, Label, Modal, Navbar, ThemeToggle, toast, Toaster } from '@fuxui/base';
+	import {
+		Button,
+		Heading,
+		Input,
+		Label,
+		Modal,
+		Navbar,
+		ThemeToggle,
+		toast,
+		Toaster
+	} from '@fuxui/base';
 	import type { UpdateFunction } from '$lib/website/data.js';
 	import { SelectThemePopover } from '@fuxui/colors';
 	import ThemeWrapper from './ThemeWrapper.svelte';
 	import { settingsModal } from './EditHead.svelte';
+	import { base } from '$app/paths';
 
 	let updateFunctions: UpdateFunction[] = $state([]);
 
@@ -49,6 +60,22 @@
 
 	<Navbar class="mx-4 mt-3 max-w-3xl rounded-full px-4 md:mx-auto">
 		<div class="flex items-center gap-2">
+			<Button size="iconLg" variant="ghost" class="backdrop-blur-none" href={base + '/'}>
+				<span class="sr-only">home</span>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					fill="none"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+				>
+					<path
+						stroke-linecap="round"
+						stroke-linejoin="round"
+						d="m2.25 12 8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25"
+					/>
+				</svg>
+			</Button>
 			<SelectThemePopover />
 			<Button
 				size="iconLg"
@@ -111,4 +138,4 @@
 	</Navbar>
 </ThemeWrapper>
 
-<Toaster />
\ No newline at end of file
+<Toaster />
diff --git a/src/routes/blog/[rkey]/+layout.server.ts b/src/routes/blog/[rkey]/+layout.server.ts
new file mode 100644
index 0000000..9f19734
--- /dev/null
+++ b/src/routes/blog/[rkey]/+layout.server.ts
@@ -0,0 +1,18 @@
+export async function load({ params }) {
+	const { rkey } = params;
+
+	const collection = 'dev.flo-bit.blog.entry';
+
+	// console.log(convertPathToUri(uri));
+	// const { collection, rkey } = parseUri(convertPathToUri(uri)) as {
+	// 	collection: ListCollections;
+	// 	rkey: string;
+	// };
+
+	return {
+		current: {
+			collection,
+			rkey
+		}
+	};
+}
diff --git a/src/routes/blog/[uri]/+page.svelte b/src/routes/blog/[rkey]/+page.svelte
similarity index 100%
rename from src/routes/blog/[uri]/+page.svelte
rename to src/routes/blog/[rkey]/+page.svelte
diff --git a/src/routes/blog/[uri]/edit/+page.svelte b/src/routes/blog/[rkey]/edit/+page.svelte
similarity index 100%
rename from src/routes/blog/[uri]/edit/+page.svelte
rename to src/routes/blog/[rkey]/edit/+page.svelte
diff --git a/src/routes/blog/[uri]/+layout.server.ts b/src/routes/blog/[uri]/+layout.server.ts
deleted file mode 100644
index 1b8c542..0000000
--- a/src/routes/blog/[uri]/+layout.server.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { loadData, parseUri, type ListCollections } from '$lib/website/data';
-
-export async function load({ params }) {
-	const { uri } = params;
-	const { did, data } = await loadData();
-
-	const { collection, rkey } = parseUri(uri) as {
-		collection: ListCollections;
-		rkey: string;
-	};
-
-	return {
-		did,
-		uri,
-		data,
-		current: {
-			collection,
-			rkey
-		}
-	};
-}