diff --git a/src/lib/components/PublicationCard.svelte b/src/lib/components/PublicationCard.svelte
index 80949bd..a0824c0 100644
--- a/src/lib/components/PublicationCard.svelte
+++ b/src/lib/components/PublicationCard.svelte
@@ -2,12 +2,16 @@
   import { getContext } from "svelte";
   import { createQuery } from "@tanstack/svelte-query";
   import type { QuicksliceClient } from "quickslice-client-js";
-  import { parseAtUri, resolveHandle, type MiniDoc, type PublicationNode } from "$lib/utils";
+  import { parseAtUri, resolveHandle, type MiniDoc, type PublicationNode, type SubscriptionNode } from "$lib/utils";
 
   const user = getContext("user") as MiniDoc;
   const atclient = getContext("atclient") as QuicksliceClient;
 
-  let { publication, showEmpty = false }: { publication: PublicationNode, showEmpty?: boolean } = $props();
+  let { publication, showEmpty = false }: { 
+    publication: PublicationNode & {  viewerSiteStandardGraphSubscriptionViaPublication?: SubscriptionNode | null }, showEmpty?: boolean 
+  } = $props();
+
+  const { rkey: pubRkey } = parseAtUri(publication.uri);
 
   let disableSubscribeButton = $state(false);
   let isSubscribeButtonHovered = $state(false);
@@ -44,34 +48,11 @@
     },
   }));
 
-  const subscriptionQuery = createQuery(() => ({
-    queryKey: ["isSubscribed", publication.uri, user && user.did],
-    queryFn: async () => {
-      if (!user.did) {
-        return { records: [] }
-      }
-      const constellationUrl = new URL("https://constellation.microcosm.blue/xrpc/blue.microcosm.links.getBacklinks");
-      constellationUrl.searchParams.set("subject", publication.uri);
-      constellationUrl.searchParams.set("source", "site.standard.graph.subscription:publication");
-      constellationUrl.searchParams.set("did", user.did);
-      const response = await fetch(constellationUrl, {
-        headers: {
-          "Accept": "application/json"
-        }
-      });
-
-
-      const json = await response.json() as { records: { did: string, collection: string, rkey: string }[] };
-      return json;
-    },
-    select: (data) => data.records[0] && data.records[0].rkey
-  }));
-
   let documents = $derived(countQuery.data?.documents || 0);
   let subscribers = $derived(countQuery.data?.subscribers || 0);
-  let subscriptionRkey = $derived(subscriptionQuery.data);
-  let blobSyncUrl = $derived((`${miniDocQuery.data?.pds}/xrpc/com.atproto.sync.getBlob?did=${publication.did}&cid=${publication.value.icon?.ref.$link}`));
-  const theme = publication.value.basicTheme || { 
+  let subscriptionRkey = $derived(parseAtUri(publication.viewerSiteStandardGraphSubscriptionViaPublication?.uri || "").rkey);
+  let blobSyncUrl = $derived(`${miniDocQuery.data?.pds}/xrpc/com.atproto.sync.getBlob?did=${publication.did}&cid=${publication.icon?.ref}`);
+  const theme = publication.basicTheme || { 
     $type: "site.standard.theme.basic",
     background: {
       $type: "site.standard.theme.color#rgb",
@@ -167,15 +148,15 @@
   `}
 >
   <div class="flex flex-1 flex-col items-center justify-center gap-3 p-8">
-    {#if publication.value.icon}
+    {#if publication.icon}
       <img 
         src={blobSyncUrl.toString()} 
-        alt={publication.value.name} 
+        alt={publication.name} 
         class="size-24 rounded-xl hover:-rotate-15 transition-transform duration-150" 
       />
     {/if}
     <h3 class="text-xl font-semibold text-center text-balance">
-      {publication.value.name}
+      {publication.name}
     </h3>
     <a 
       href={`https://bsky.app/profile/${publication.actorHandle}`}
@@ -187,12 +168,13 @@
       by @{publication.actorHandle} 
     </a>
     <p class="text-xs text-center max-w-md leading-relaxed font-neco">
-      {publication.value.description}
+      {publication.description}
     </p>
   </div>
 
   <div class="flex w-full lg:w-32 border-t lg:flex-col lg:border-t-0 lg:border-l bg-muted/50">
-    <div 
+    <a
+      href={`/${miniDocQuery.data?.handle}/${pubRkey}`}
       class="group flex flex-1 flex-col items-center justify-center gap-1 border-r lg:border-r-0 lg:border-b border-border p-4 hover:cursor-pointer"
       style={`
         background-color: rgb(${theme.accent.r},${theme.accent.g},${theme.accent.b});
@@ -206,7 +188,7 @@
         Documents
         <span class="group-hover:rotate-45 transition-transform duration-150">↗</span>
       </span>
-    </div>
+    </a>
     <button
       onclick={toggleSubscribe}
       disabled={disableSubscribeButton}
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 1cb5bbf..e541111 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -39,7 +39,7 @@ export type Node = {
 
 export type ATBlob = {
   $type: string;
-  ref: { $link: string; };
+  ref: string;
   mimeType: string;
   size: number;
 }
@@ -51,7 +51,7 @@ export type StandardSiteThemeColorRGB = {
   r: number;
 }
 
-export type PublicationNode = Node & { value: {
+export type PublicationNode = Node & {
   url: string;
   name: string;
   description: string;
@@ -67,7 +67,11 @@ export type PublicationNode = Node & { value: {
     accent: StandardSiteThemeColorRGB;
     accentForeground: StandardSiteThemeColorRGB;
   };
-}}
+}
+
+export type SubscriptionNode = Node & {
+  publication: string;  
+}
 
 export type DocumentNode = Node & { value: {
   title: string;
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
new file mode 100644
index 0000000..e403655
--- /dev/null
+++ b/src/routes/+error.svelte
@@ -0,0 +1,5 @@
+<script lang="ts">
+  import { page } from "$app/state";
+</script>
+
+<p>{page.error.message}</p>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 65b2f9e..e9cd68d 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
   import '../app.css';
 	import { page } from '$app/state';
-  import { onMount, setContext } from 'svelte';
+  import { setContext } from 'svelte';
   import { QueryClient, QueryClientProvider } from "@tanstack/svelte-query";
   import { SvelteQueryDevtools } from "@tanstack/svelte-query-devtools";
-    import { goto } from '$app/navigation';
 
 	let { data, children } = $props();
   const { atclient, user } = data;
@@ -32,14 +31,6 @@
       }
     }
   });
-
-  /**
-  onMount(() => {
-    if (user) {
-      goto("/home");
-    }
-  });
-  **/
 </script>
 
 <QueryClientProvider client={queryClient}>
@@ -50,9 +41,9 @@
 
       <div class="flex gap-4 items-center flex-wrap">
         <nav class="flex gap-4 flex-wrap items-center px-3 py-1.5">
-          <a href="/explore" class="hover:text-shadow-sm" title="explore" aria-label="explore">🛰️ explore</a>
+          <a href="/explore" class="hover:text-shadow-sm" title="explore" aria-label="explore">🛰️ Explore</a>
           {#if user}
-            <a href="/home" class="hover:text-shadow-sm" title="explore" aria-label="explore">🏠 {user.handle}</a>
+            <a href="/home" class="hover:text-shadow-sm" title="explore" aria-label="explore">🏠 Home</a>
           {/if}
         </nav>
         {#if user}
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index f7de836..865dae7 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -13,7 +13,7 @@ export const load = async ({ url }: LayoutLoadEvent) => {
 
   if (url.searchParams.has("code")) {
     await atclient.handleRedirectCallback();
-    redirect(302, "/");
+    redirect(302, "/home");
   }
 
   const isAuthed = await atclient.isAuthenticated();
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index a4f7fd1..bcf3b64 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,10 +1,20 @@
 <script lang="ts">
+  import { getContext } from "svelte";
   import LeafletIcon from "$lib/components/LeafletIcon.svelte";
   import OffprintIcon from "$lib/components/OffprintIcon.svelte";
   import PcktIcon from "$lib/components/PcktIcon.svelte";
-</script>
+    import type { QuicksliceClient } from "quickslice-client-js";
 
+  const user = getContext("user");
+  const atclient = getContext("atclient") as QuicksliceClient;
+  let handleInput = $state("");
 
+  async function login() {
+    if (handleInput) {
+      await atclient.loginWithRedirect({ handle: handleInput });
+    }
+  }
+</script>
 
 <section class="flex flex-col gap-4 my-8">
   <h2 class="text-amber-400 text-2xl font-bold font-neco">Talk about what everyone's reading today</h2>
@@ -39,7 +49,19 @@
   <h2 class="text-center text-amber-400 text-3xl font-bold font-neco">Find your next read on potatonet</h2>
   <div class="flex gap-4">
     <a href="/explore" class="bg-amber-400 text-black hover:cursor-pointer hover:bg-amber-500 hover:text-white px-4 py-2">🛰️ Explore</a>
-    <button class="bg-amber-400 text-black hover:cursor-pointer hover:bg-amber-500 hover:text-white px-4 py-2">Login</button>
+    {#if user}
+      <a href="/home" class="bg-amber-400 text-black hover:cursor-pointer hover:bg-amber-500 hover:text-white px-4 py-2">🏠 Home</a>
+    {:else}
+      <input 
+        type="text" 
+        bind:value={handleInput}
+        placeholder="Handle (eg: zeu.dev)" 
+        class="border border-black border-dashed text-sm px-3 py-2 hover:shadow-lg focus:shadow-lg" 
+      />
+      <button onclick={login} class="bg-amber-400 text-black hover:cursor-pointer hover:bg-amber-500 hover:text-white px-4 py-2">
+        Login
+      </button>
+    {/if}
   </div>
   <pre class="text-xs tracking-widest">
                                                                                                
diff --git a/src/routes/[handle]/[pubRkey]/+page.svelte b/src/routes/[handle]/[pubRkey]/+page.svelte
deleted file mode 100644
index 282e556..0000000
--- a/src/routes/[handle]/[pubRkey]/+page.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-  import { page } from "$app/state";
-
-  const { handle, pubRkey } = page.params;
-</script>
-
-<p>{handle} {pubRkey}</p>
diff --git a/src/routes/explore/+page.svelte b/src/routes/explore/+page.svelte
index 71aedf9..655dfe0 100644
--- a/src/routes/explore/+page.svelte
+++ b/src/routes/explore/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Debounced } from "runed";
-  import type { PublicationNode } from '$lib/utils';
+  import type { PublicationNode, SubscriptionNode } from '$lib/utils';
   import { createInfiniteQuery } from '@tanstack/svelte-query';
   import PublicationCard from '$lib/components/PublicationCard.svelte';
 
@@ -23,7 +23,24 @@
               actorHandle: { contains: "${debouncedSearchTerm.current}" }
             }]
           }`}) {
-            edges {}
+            edges {
+              node {
+                viewerSiteStandardGraphSubscriptionViaPublication {}
+                uri
+                indexedAt
+                cid
+                did
+                url
+                name
+                description
+                icon {}
+                actorHandle
+                preferences {
+                  showInDiscover
+                }
+                basicTheme {}
+              }
+            }
             pageInfo {
               hasNextPage
               endCursor
@@ -31,10 +48,19 @@
           }
         }
       `;
-      const data = await atclient.publicQuery(query);
+      let data;
+      if (user) {
+        data = await atclient.query(query);
+      }
+      else {
+        data = await atclient.publicQuery(query);
+      }
       return data as {
         siteStandardPublication: {
-          edges: { node: PublicationNode, cursor: string }[],
+          edges: { 
+            node: PublicationNode & { viewerSiteStandardGraphSubscriptionViaPublication: SubscriptionNode | null}, 
+            cursor: string 
+          }[],
           pageInfo: {
             hasNextPage: boolean;
             endCursor: string;
@@ -98,7 +124,7 @@
   {#if currentPage?.length === 0}
     There are no publications based onb the current filters
   {/if}
-  {#each currentPage as publication (publication.uri)}
+  {#each currentPage as publication, i (i)}
     <PublicationCard {publication} />
   {/each}
 {/if}
diff --git a/src/routes/home/+page.svelte b/src/routes/home/+page.svelte
index f2e9f6f..c6e8501 100644
--- a/src/routes/home/+page.svelte
+++ b/src/routes/home/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { Debounced } from "runed";
   import { goto } from "$app/navigation";
   import { getContext, onMount } from "svelte";
   import type { MiniDoc, PublicationNode } from "$lib/utils";
@@ -28,7 +27,22 @@
           }) {
             edges {
               node {
-                publicationResolved {}
+                uri
+                publicationResolved {
+                  uri
+                  indexedAt
+                  cid
+                  did
+                  url
+                  name
+                  description
+                  icon {}
+                  actorHandle
+                  preferences {
+                    showInDiscover
+                  }
+                  basicTheme {}
+                }
               }
             }
             pageInfo {
@@ -39,10 +53,10 @@
         }
       `;
 
-      const data = await atclient.publicQuery(query);
+      const data = await atclient.query(query);
       return data as {
         siteStandardGraphSubscription: {
-          edges: { node: { publicationResolved: PublicationNode }}[],
+          edges: { node: { uri: string, publicationResolved: PublicationNode }}[],
           pageInfo: {
             hasNextPage: boolean;
             endCursor: string;
@@ -54,7 +68,7 @@
     getNextPageParam: (lastPage) => lastPage.siteStandardGraphSubscription.pageInfo.endCursor, 
     select: (data) => { 
       const items = data.pages.map((page) => page.siteStandardGraphSubscription.edges).flat();
-      const nodes = items.map((i) => i.node.publicationResolved);
+      const nodes = items.map((i) => { return { ...(i.node.publicationResolved), viewerSiteStandardGraphSubscriptionViaPublication: { uri: i.node.uri }} });
       return nodes;
     }
   }));