diff --git a/actions/getIdentityData.ts b/actions/getIdentityData.ts
index 7224413b..076bc760 100644
--- a/actions/getIdentityData.ts
+++ b/actions/getIdentityData.ts
@@ -24,6 +24,7 @@ export async function uncachedGetIdentityData() {
                               entity_sets(entities(facts(*)))
             )),
             permission_token_on_homepage(
+              archived,
               created_at,
               permission_tokens!inner(
                 id,
diff --git a/app/(home-pages)/home/HomeLayout.tsx b/app/(home-pages)/home/HomeLayout.tsx
index 07cf692c..498b1820 100644
--- a/app/(home-pages)/home/HomeLayout.tsx
+++ b/app/(home-pages)/home/HomeLayout.tsx
@@ -33,6 +33,7 @@ import {
 
 type Leaflet = {
   added_at: string;
+  archived?: boolean | null;
   token: PermissionToken & {
     leaflets_in_publications?: Exclude<
       GetLeafletDataReturnType["result"]["data"],
@@ -147,6 +148,7 @@ export function HomeLeafletList(props: {
     ? identity.permission_token_on_homepage.map((ptoh) => ({
         added_at: ptoh.created_at,
         token: ptoh.permission_tokens as PermissionToken,
+        archived: ptoh.archived,
       }))
     : localLeaflets
         .sort((a, b) => (a.added_at > b.added_at ? -1 : 1))
@@ -204,7 +206,7 @@ export function LeafletList(props: {
         w-full
         ${display === "grid" ? "grid auto-rows-max md:grid-cols-4 sm:grid-cols-3 grid-cols-2 gap-y-4 gap-x-4 sm:gap-x-6 sm:gap-y-5 grow" : "flex flex-col gap-2 pt-2"} `}
     >
-      {props.leaflets.map(({ token: leaflet, added_at }, index) => (
+      {props.leaflets.map(({ token: leaflet, added_at, archived }, index) => (
         <ReplicacheProvider
           disablePull
           initialFactsOnly={!!identity}
@@ -224,6 +226,7 @@ export function LeafletList(props: {
           >
             <LeafletListItem
               title={props?.titles?.[leaflet.root_entity] || "Untitled"}
+              archived={archived}
               token={leaflet}
               draft={!!leaflet.leaflets_in_publications?.length}
               published={!!leaflet.leaflets_in_publications?.find((l) => l.doc)}
diff --git a/app/(home-pages)/home/LeafletList/LeafletInfo.tsx b/app/(home-pages)/home/LeafletList/LeafletInfo.tsx
index fcb0aafc..7d44d013 100644
--- a/app/(home-pages)/home/LeafletList/LeafletInfo.tsx
+++ b/app/(home-pages)/home/LeafletList/LeafletInfo.tsx
@@ -21,14 +21,13 @@ export const LeafletInfo = (props: {
   added_at: string;
   publishedAt?: string;
   document_uri?: string;
+  archived?: boolean | null;
 }) => {
   let [prefetch, setPrefetch] = useState(false);
   let prettyCreatedAt = props.added_at ? timeAgo(props.added_at) : "";
 
   let prettyPublishedAt = props.publishedAt ? timeAgo(props.publishedAt) : "";
 
-  let shareLink = usePublishLink();
-  console.log(shareLink);
   return (
     <div
       className={`leafletInfo w-full min-w-0 flex flex-col ${props.className}`}
@@ -57,7 +56,8 @@ export const LeafletInfo = (props: {
             isTemplate={props.isTemplate}
             draft={props.draft}
             document_uri={props.document_uri}
-            shareLink={shareLink}
+            shareLink={`/${props.token.id}`}
+            archived={props.archived}
           />
         </div>
       </div>
diff --git a/app/(home-pages)/home/LeafletList/LeafletListItem.tsx b/app/(home-pages)/home/LeafletList/LeafletListItem.tsx
index b51f7080..4a08db08 100644
--- a/app/(home-pages)/home/LeafletList/LeafletListItem.tsx
+++ b/app/(home-pages)/home/LeafletList/LeafletListItem.tsx
@@ -7,6 +7,7 @@ import { useState, useRef, useEffect } from "react";
 
 export const LeafletListItem = (props: {
   token: PermissionToken;
+  archived?: boolean | null;
   leaflet_id: string;
   loggedIn: boolean;
   display: "list" | "grid";
diff --git a/app/(home-pages)/home/LeafletList/LeafletOptions.tsx b/app/(home-pages)/home/LeafletList/LeafletOptions.tsx
index 10abf061..63191ff8 100644
--- a/app/(home-pages)/home/LeafletList/LeafletOptions.tsx
+++ b/app/(home-pages)/home/LeafletList/LeafletOptions.tsx
@@ -31,15 +31,13 @@ export const LeafletOptions = (props: {
   isTemplate?: boolean;
   draft?: boolean;
   document_uri?: string;
-  shareLink: string | undefined | null;
+  shareLink: string;
+  archived?: boolean | null;
 }) => {
-  console.log("sharelink: " + props.shareLink);
-  let { mutate: mutateIdentity } = useIdentityData();
   let [state, setState] = useState<"normal" | "template" | "areYouSure">(
     "normal",
   );
   let [open, setOpen] = useState(false);
-  let smoker = useSmoker();
   return (
     <>
       <Menu
@@ -62,68 +60,26 @@ export const LeafletOptions = (props: {
         }
       >
         {state === "normal" ? (
-          <>
-            <ShareButton
-              className=""
-              text={
-                <div className="flex gap-2">
-                  <ShareSmall />
-                  Copy {props.document_uri ? "Post" : "Edit"} Link
-                </div>
-              }
-              subtext=""
-              smokerText="Link copied!"
-              id="get-link"
-              link={`/${props.leaflet.id}`}
+          props.document_uri ? (
+            <PublishedPostOptions
+              setState={setState}
+              document_uri={props.document_uri}
+              {...props}
             />
-
-            {!props.isTemplate ? (
-              <MenuItem
-                onSelect={(e) => {
-                  e.preventDefault();
-                  setState("template");
-                }}
-              >
-                <TemplateSmall /> Use as Template
-              </MenuItem>
-            ) : (
-              <MenuItem
-                onSelect={(e) => {
-                  useTemplateState.getState().removeTemplate(props.leaflet);
-                  let newLeafletButton =
-                    document.getElementById("new-leaflet-button");
-                  if (!newLeafletButton) return;
-                  let rect = newLeafletButton.getBoundingClientRect();
-                  smoker({
-                    static: true,
-                    text: <strong>Removed template!</strong>,
-                    position: {
-                      y: rect.top,
-                      x: rect.right + 5,
-                    },
-                  });
-                }}
-              >
-                <TemplateRemoveSmall /> Remove from Templates
-              </MenuItem>
-            )}
-            <hr className="border-border-light" />
-            {props.document_uri ? (
-              <PublishedPostOptions
-                setState={setState}
-                document_uri={props.document_uri}
-              />
-            ) : (
-              <DefaultOptions setState={setState} draft={props.draft} />
-            )}
-          </>
+          ) : (
+            <DefaultOptions
+              isTemplate={props.isTemplate}
+              setState={setState}
+              {...props}
+            />
+          )
         ) : state === "template" ? (
           <AddTemplateForm
             leaflet={props.leaflet}
             close={() => setOpen(false)}
           />
         ) : state === "areYouSure" ? (
-          <DeleteAreYouSure
+          <DeleteAreYouSureForm
             backToMenu={() => setState("normal")}
             leaflet={props.leaflet}
             document_uri={props.document_uri}
@@ -136,14 +92,35 @@ export const LeafletOptions = (props: {
 };
 
 const DefaultOptions = (props: {
-  setState: (s: "areYouSure") => void;
+  setState: (s: "areYouSure" | "template") => void;
   draft?: boolean;
+  leaflet: PermissionToken;
+  isTemplate: boolean | undefined;
+  shareLink: string;
 }) => {
   return (
     <>
+      <ShareButton
+        text={
+          <div className="flex gap-2">
+            <ShareSmall />
+            Copy Edit Link
+          </div>
+        }
+        smokerText="Link copied!"
+        id="get-link"
+        link={`/${props.shareLink}`}
+      />
+      <TemplateOptions
+        leaflet={props.leaflet}
+        setState={props.setState}
+        isTemplate={props.isTemplate}
+      />
+
+      <hr className="border-border-light" />
       <MenuItem onSelect={() => {}}>
         <ArchiveSmall />
-        Archive{props.draft && " Draft"}
+        Archive{props.draft ? " Draft" : " Leaflet"}
       </MenuItem>
       <MenuItem
         onSelect={(e) => {
@@ -161,11 +138,25 @@ const DefaultOptions = (props: {
 const PublishedPostOptions = (props: {
   setState: (s: "areYouSure") => void;
   document_uri: string;
+  leaflet: PermissionToken;
+  shareLink: string;
 }) => {
   let toaster = useToaster();
-  let { mutate, data } = usePublicationData();
   return (
     <>
+      <ShareButton
+        text={
+          <div className="flex gap-2">
+            <ShareSmall />
+            Copy Post Link
+          </div>
+        }
+        smokerText="Link copied!"
+        id="get-link"
+        link={`/${props.shareLink}}`}
+      />
+
+      <hr className="border-border-light" />
       <MenuItem
         onSelect={async () => {
           if (props.document_uri) {
@@ -203,7 +194,7 @@ const PublishedPostOptions = (props: {
   );
 };
 
-const DeleteAreYouSure = (props: {
+const DeleteAreYouSureForm = (props: {
   backToMenu: () => void;
   document_uri?: string;
   leaflet: PermissionToken;
@@ -297,3 +288,42 @@ const AddTemplateForm = (props: {
     </div>
   );
 };
+
+const TemplateOptions = (props: {
+  leaflet: PermissionToken;
+  isTemplate: boolean | undefined;
+  setState: (s: "template") => void;
+}) => {
+  let smoker = useSmoker();
+  if (props.isTemplate)
+    return (
+      <MenuItem
+        onSelect={(e) => {
+          useTemplateState.getState().removeTemplate(props.leaflet);
+          let newLeafletButton = document.getElementById("new-leaflet-button");
+          if (!newLeafletButton) return;
+          let rect = newLeafletButton.getBoundingClientRect();
+          smoker({
+            static: true,
+            text: <strong>Removed template!</strong>,
+            position: {
+              y: rect.top,
+              x: rect.right + 5,
+            },
+          });
+        }}
+      >
+        <TemplateRemoveSmall /> Remove from Templates
+      </MenuItem>
+    );
+  return (
+    <MenuItem
+      onSelect={(e) => {
+        e.preventDefault();
+        props.setState("template");
+      }}
+    >
+      <TemplateSmall /> Use as Template
+    </MenuItem>
+  );
+};
diff --git a/app/lish/[did]/[publication]/dashboard/PublishedPostsLists.tsx b/app/lish/[did]/[publication]/dashboard/PublishedPostsLists.tsx
index 3d6108a4..8aaa4b7a 100644
--- a/app/lish/[did]/[publication]/dashboard/PublishedPostsLists.tsx
+++ b/app/lish/[did]/[publication]/dashboard/PublishedPostsLists.tsx
@@ -60,7 +60,7 @@ export function PublishedPostsList(props: {
 
           let postLink = data?.publication
             ? `${getPublicationURL(data?.publication)}/${new AtUri(doc.documents.uri).rkey}`
-            : null;
+            : "";
 
           return (
             <Fragment key={doc.documents?.uri}>
diff --git a/components/HomeButton.tsx b/components/HomeButton.tsx
index ec73e044..43cf2d3e 100644
--- a/components/HomeButton.tsx
+++ b/components/HomeButton.tsx
@@ -52,6 +52,7 @@ const AddToHomeButton = (props: {}) => {
             permission_token_on_homepage: [
               ...identity.permission_token_on_homepage,
               {
+                archived: null,
                 created_at: new Date().toISOString(),
                 permission_tokens: {
                   ...permission_token,
diff --git a/components/Pages/PageShareMenu.tsx b/components/Pages/PageShareMenu.tsx
index e4b37e7a..1ae183da 100644
--- a/components/Pages/PageShareMenu.tsx
+++ b/components/Pages/PageShareMenu.tsx
@@ -14,16 +14,14 @@ export const PageShareMenu = (props: { entityID: string }) => {
     <div>
       <ShareButton
         text="Share Edit Link"
-        subtext=""
-        helptext="recipients can edit the full Leaflet"
+        subtext="Recipients can edit the full Leaflet"
         smokerText="Collab link copied!"
         id="get-page-collab-link"
         link={`${collabLink}?page=${props.entityID}`}
       />
       <ShareButton
         text="Share View Link"
-        subtext=""
-        helptext="recipients can view the full Leaflet"
+        subtext="Recipients can view the full Leaflet"
         smokerText="Publish link copied!"
         id="get-page-publish-link"
         fullLink={
diff --git a/components/ShareOptions/index.tsx b/components/ShareOptions/index.tsx
index 8eeb8577..b44f2562 100644
--- a/components/ShareOptions/index.tsx
+++ b/components/ShareOptions/index.tsx
@@ -182,8 +182,7 @@ const ShareMenu = (props: {
 
 export const ShareButton = (props: {
   text: React.ReactNode;
-  subtext: React.ReactNode;
-  helptext?: string;
+  subtext?: React.ReactNode;
   smokerText: string;
   id: string;
   link: null | string;
@@ -214,21 +213,12 @@ export const ShareButton = (props: {
         }
       }}
     >
-      <div className={`group/${props.id} ${props.className}`}>
-        <div className={`group-hover/${props.id}:text-accent-contrast`}>
-          {props.text}
-        </div>
-        <div
-          className={`text-sm font-normal text-tertiary group-hover/${props.id}:text-accent-contrast`}
-        >
-          {props.subtext}
-        </div>
-        {/* optional help text */}
-        {props.helptext && (
-          <div
-            className={`text-sm italic font-normal text-tertiary group-hover/${props.id}:text-accent-contrast`}
-          >
-            {props.helptext}
+      <div className={`group/${props.id} ${props.className} leading-snug`}>
+        {props.text}
+
+        {props.subtext && (
+          <div className={`text-sm  font-normal text-tertiary`}>
+            {props.subtext}
           </div>
         )}
       </div>