diff --git a/actions/deleteLeaflet.ts b/actions/deleteLeaflet.ts
index 3e64b942..5302b5c4 100644
--- a/actions/deleteLeaflet.ts
+++ b/actions/deleteLeaflet.ts
@@ -42,36 +42,31 @@ export async function archivePost(token: string) {
   let identity = await getIdentityData();
   if (!identity) throw new Error("No Identity");
 
+  // Archive on homepage
   await supabaseServerClient
     .from("permission_token_on_homepage")
     .update({ archived: true })
     .eq("token", token)
     .eq("identity", identity.id);
-  refresh();
-  return;
-}
-export async function archivePublicationDraft(
-  token: string,
-  publication: string,
-) {
-  console.log("ARCHIVING", token, publication);
-  let identity = await getIdentityData();
-  if (!identity) throw new Error("No Identity");
-  let { data: pub } = await supabaseServerClient
-    .from("publications")
-    .select("*")
-    .eq("uri", publication)
-    .single();
 
-  if (!pub || pub.identity_did !== identity.atp_did) return;
+  // Check if leaflet is in any publications where user is the creator
+  let { data: leafletInPubs } = await supabaseServerClient
+    .from("leaflets_in_publications")
+    .select("publication, publications!inner(identity_did)")
+    .eq("leaflet", token);
+
+  if (leafletInPubs) {
+    for (let pub of leafletInPubs) {
+      if (pub.publications.identity_did === identity.atp_did) {
+        await supabaseServerClient
+          .from("leaflets_in_publications")
+          .update({ archived: true })
+          .eq("leaflet", token)
+          .eq("publication", pub.publication);
+      }
+    }
+  }
 
-  console.log(
-    await supabaseServerClient
-      .from("leaflets_in_publications")
-      .update({ archived: true })
-      .eq("leaflet", token)
-      .eq("publication", publication),
-  );
   refresh();
   return;
 }
@@ -80,11 +75,31 @@ export async function unarchivePost(token: string) {
   let identity = await getIdentityData();
   if (!identity) throw new Error("No Identity");
 
+  // Unarchive on homepage
   await supabaseServerClient
     .from("permission_token_on_homepage")
     .update({ archived: false })
     .eq("token", token)
     .eq("identity", identity.id);
+
+  // Check if leaflet is in any publications where user is the creator
+  let { data: leafletInPubs } = await supabaseServerClient
+    .from("leaflets_in_publications")
+    .select("publication, publications!inner(identity_did)")
+    .eq("leaflet", token);
+
+  if (leafletInPubs) {
+    for (let pub of leafletInPubs) {
+      if (pub.publications.identity_did === identity.atp_did) {
+        await supabaseServerClient
+          .from("leaflets_in_publications")
+          .update({ archived: false })
+          .eq("leaflet", token)
+          .eq("publication", pub.publication);
+      }
+    }
+  }
+
   refresh();
   return;
 }
diff --git a/app/(home-pages)/home/LeafletList/LeafletListItem.tsx b/app/(home-pages)/home/LeafletList/LeafletListItem.tsx
index b3658449..bb596b82 100644
--- a/app/(home-pages)/home/LeafletList/LeafletListItem.tsx
+++ b/app/(home-pages)/home/LeafletList/LeafletListItem.tsx
@@ -51,25 +51,26 @@ export const LeafletListItem = (props: {
   if (props.display === "list")
     return (
       <>
-        <LeafletLink
-          id={props.token.id}
-          className={`w-full ${props.isHidden ? "hidden" : "block"}`}
+        <div
+          ref={previewRef}
+          className={`relative flex gap-3 w-full
+            ${props.isHidden ? "hidden" : "flex"}
+            ${props.cardBorderHidden ? "" : "px-2 py-1 block-border hover:outline-border relative"}`}
+          style={{
+            backgroundColor: props.cardBorderHidden
+              ? "transparent"
+              : "rgba(var(--bg-page), var(--bg-page-alpha))",
+          }}
         >
-          <div
-            ref={previewRef}
-            className={`flex gap-3 w-full ${props.cardBorderHidden ? "" : "px-2 py-1 block-border hover:outline-border relative"}`}
-            style={{
-              backgroundColor: props.cardBorderHidden
-                ? "transparent"
-                : "rgba(var(--bg-page), var(--bg-page-alpha))",
-            }}
-          >
-            {props.showPreview && (
-              <LeafletListPreview isVisible={isOnScreen} {...props} />
-            )}
-            <LeafletInfo isTemplate={isTemplate} {...props} />
-          </div>
-        </LeafletLink>
+          <SpeedyLink
+            href={`/${props.token.id}`}
+            className={`absolute w-full h-full top-0 left-0 no-underline hover:no-underline! text-primary`}
+          />
+          {props.showPreview && (
+            <LeafletListPreview isVisible={isOnScreen} {...props} />
+          )}
+          <LeafletInfo isTemplate={isTemplate} {...props} />
+        </div>
         {props.cardBorderHidden && (
           <hr
             className="last:hidden border-border-light"
@@ -81,46 +82,41 @@ export const LeafletListItem = (props: {
       </>
     );
   return (
-    <LeafletLink
-      id={props.token.id}
-      className={`leafletGridListItem relative w-full ${props.isHidden ? "hidden" : "flex"}`}
-    >
-      <div
-        ref={previewRef}
-        className={`
+    <div
+      ref={previewRef}
+      className={`
+          relative
         flex flex-col gap-1 p-1 h-52 w-full
        block-border border-border! hover:outline-border
+       ${props.isHidden ? "hidden" : "flex"}
         `}
-        style={{
-          backgroundColor: props.cardBorderHidden
-            ? "transparent"
-            : "rgba(var(--bg-page), var(--bg-page-alpha))",
-        }}
-      >
-        <div className="grow">
-          <LeafletGridPreview {...props} isVisible={isOnScreen} />
-        </div>
-        <LeafletInfo
-          isTemplate={isTemplate}
-          className="px-1 pb-0.5 shrink-0"
-          {...props}
-        />
+      style={{
+        backgroundColor: props.cardBorderHidden
+          ? "transparent"
+          : "rgba(var(--bg-page), var(--bg-page-alpha))",
+      }}
+    >
+      <SpeedyLink
+        href={`/${props.token.id}`}
+        className={`absolute w-full h-full top-0 left-0 no-underline hover:no-underline! text-primary`}
+      />
+      <div className="grow">
+        <LeafletGridPreview {...props} isVisible={isOnScreen} />
       </div>
-    </LeafletLink>
+      <LeafletInfo
+        isTemplate={isTemplate}
+        className="px-1 pb-0.5 shrink-0"
+        {...props}
+      />
+    </div>
   );
 };
 
-const LeafletLink = (props: {
-  id: string;
-  children: React.ReactNode;
-  className: string;
-}) => {
+const LeafletLink = (props: { id: string; className: string }) => {
   return (
     <SpeedyLink
       href={`/${props.id}`}
       className={`no-underline hover:no-underline! text-primary ${props.className}`}
-    >
-      {props.children}
-    </SpeedyLink>
+    />
   );
 };
diff --git a/app/(home-pages)/home/LeafletList/LeafletOptions.tsx b/app/(home-pages)/home/LeafletList/LeafletOptions.tsx
index a76a47e4..7781906b 100644
--- a/app/(home-pages)/home/LeafletList/LeafletOptions.tsx
+++ b/app/(home-pages)/home/LeafletList/LeafletOptions.tsx
@@ -11,7 +11,6 @@ import { MoreOptionsVerticalTiny } from "components/Icons/MoreOptionsVerticalTin
 import { DeleteSmall } from "components/Icons/DeleteSmall";
 import {
   archivePost,
-  archivePublicationDraft,
   deleteLeaflet,
   unarchivePost,
 } from "actions/deleteLeaflet";
@@ -124,11 +123,7 @@ const DefaultOptions = (props: {
       <MenuItem
         onSelect={async () => {
           if (!props.archived) {
-            if (props.draftInPublication)
-              await archivePublicationDraft(
-                props.leaflet.id,
-                props.draftInPublication,
-              );
+            await archivePost(props.leaflet.id);
             toaster({
               content: (
                 <div className="font-bold flex gap-2">
diff --git a/app/(home-pages)/home/LeafletList/LeafletPreview.tsx b/app/(home-pages)/home/LeafletList/LeafletPreview.tsx
index 0b92c225..e3530f8a 100644
--- a/app/(home-pages)/home/LeafletList/LeafletPreview.tsx
+++ b/app/(home-pages)/home/LeafletList/LeafletPreview.tsx
@@ -133,12 +133,12 @@ export const LeafletGridPreview = (props: {
   );
   return (
     <ThemeProvider local entityID={root} className="w-full!">
-      <div className="border border-border-light rounded-md w-full h-full overflow-hidden relative">
-        <div className="relative w-full h-full">
+      <div className="border border-border-light rounded-md w-full h-full overflow-hidden ">
+        <div className="w-full h-full">
           <ThemeBackgroundProvider entityID={root}>
             <div
               inert
-              className="leafletPreview relative grow shrink-0 h-full w-full px-2 pt-2 sm:px-3 sm:pt-3 flex items-end pointer-events-none"
+              className="leafletPreview grow shrink-0 h-full w-full px-2 pt-2 sm:px-3 sm:pt-3 flex items-end pointer-events-none"
             >
               <div
                 className={`leafletContentWrapper h-full sm:w-48 w-40 mx-auto overflow-clip ${!cardBorderHidden && "border border-border-light border-b-0 rounded-t-md"}`}
diff --git a/app/lish/[did]/[publication]/dashboard/PublicationSWRProvider.tsx b/app/lish/[did]/[publication]/dashboard/PublicationSWRProvider.tsx
index 17a0b1f0..b6da3cbd 100644
--- a/app/lish/[did]/[publication]/dashboard/PublicationSWRProvider.tsx
+++ b/app/lish/[did]/[publication]/dashboard/PublicationSWRProvider.tsx
@@ -2,8 +2,8 @@
 
 import type { GetPublicationDataReturnType } from "app/api/rpc/[command]/get_publication_data";
 import { callRPC } from "app/api/rpc/client";
-import { createContext, useContext } from "react";
-import useSWR, { SWRConfig } from "swr";
+import { createContext, useContext, useEffect } from "react";
+import useSWR, { SWRConfig, mutate } from "swr";
 
 const PublicationContext = createContext({ name: "", did: "" });
 export function PublicationSWRDataProvider(props: {
@@ -13,6 +13,10 @@ export function PublicationSWRDataProvider(props: {
   children: React.ReactNode;
 }) {
   let key = `publication-data-${props.publication_did}-${props.publication_rkey}`;
+  useEffect(() => {
+    console.log("UPDATING");
+    mutate(key, props.publication_data);
+  }, [props.publication_data]);
   return (
     <PublicationContext
       value={{ name: props.publication_rkey, did: props.publication_did }}