diff --git a/app/lish/[handle]/[publication]/CallToActionButton.tsx b/app/lish/[handle]/[publication]/CallToActionButton.tsx
deleted file mode 100644
index 3c73e65f..00000000
--- a/app/lish/[handle]/[publication]/CallToActionButton.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-"use client";
-
-import { SubscribeButton } from "app/lish/Subscribe";
-import { usePublicationRelationship } from "./usePublicationRelationship";
-import { usePublicationContext } from "components/Providers/PublicationContext";
-import { NewDraftButton } from "./NewDraftButton";
-import { Menu, MenuItem } from "components/Layout";
-import { useIdentityData } from "components/IdentityProvider";
-import { unsubscribeFromPublication } from "actions/unsubscribeFromPublication";
-import { MoreOptionsTiny } from "components/Icons/MoreOptionsTiny";
-
-export function CallToActionButton() {
-  let rel = usePublicationRelationship();
-  let { publication } = usePublicationContext();
-  if (!publication) return null;
-  if (rel?.isAuthor) return <NewDraftButton publication={publication.uri} />;
-  if (rel?.isSubscribed)
-    return (
-      <div className="flex gap-2">
-        <div className="font-bold">You're Subscribed!</div>
-        <ManageSubscriptionMenu publication_uri={publication.uri} />
-      </div>
-    );
-  return <SubscribeButton publication={publication.uri} />;
-}
-
-const ManageSubscriptionMenu = (props: { publication_uri: string }) => {
-  let { mutate } = useIdentityData();
-  return (
-    <Menu trigger={<MoreOptionsTiny className="rotate-90" />}>
-      <MenuItem
-        onSelect={async () => {
-          await unsubscribeFromPublication(props.publication_uri);
-          mutate();
-        }}
-      >
-        Unsub!
-      </MenuItem>
-    </Menu>
-  );
-};
diff --git a/app/lish/[handle]/[publication]/DraftList.tsx b/app/lish/[handle]/[publication]/DraftList.tsx
index 4145fa45..ccdbc745 100644
--- a/app/lish/[handle]/[publication]/DraftList.tsx
+++ b/app/lish/[handle]/[publication]/DraftList.tsx
@@ -4,8 +4,10 @@ import { Fact, ReplicacheProvider } from "src/replicache";
 import { usePublicationRelationship } from "./usePublicationRelationship";
 import { usePublicationContext } from "components/Providers/PublicationContext";
 import Link from "next/link";
+import { NewDraftSecondaryButton } from "./NewDraftButton";
 
 export function DraftList(props: {
+  publication: string;
   drafts: { id: string; initialFacts: Fact<any>[]; root_entity: string }[];
 }) {
   let rel = usePublicationRelationship();
@@ -13,8 +15,8 @@ export function DraftList(props: {
   if (!publication) return null;
   if (!rel?.isAuthor) return null;
   return (
-    <div className="">
-      <h2>drafts</h2>
+    <div className="flex flex-col gap-2">
+      <NewDraftSecondaryButton publication={props.publication} />
       {props.drafts.map((d) => {
         return (
           <ReplicacheProvider
diff --git a/app/lish/[handle]/[publication]/NewDraftButton.tsx b/app/lish/[handle]/[publication]/NewDraftButton.tsx
index ec04bc28..65701501 100644
--- a/app/lish/[handle]/[publication]/NewDraftButton.tsx
+++ b/app/lish/[handle]/[publication]/NewDraftButton.tsx
@@ -1,20 +1,41 @@
 "use client";
 import { createPublicationDraft } from "actions/createPublicationDraft";
-import { ButtonPrimary } from "components/Buttons";
+import { ActionButton } from "components/ActionBar/ActionButton";
+import { ButtonSecondary } from "components/Buttons";
+import { AddTiny } from "components/Icons/AddTiny";
 import { useRouter } from "next/navigation";
 
-export function NewDraftButton(props: { publication: string }) {
+export function NewDraftActionButton(props: { publication: string }) {
   let router = useRouter();
+
+  return (
+    <ActionButton
+      id="new-leaflet-button"
+      primary
+      onClick={async () => {
+        let newLeaflet = await createPublicationDraft(props.publication);
+        router.push(`/${newLeaflet}`);
+      }}
+      icon=<AddTiny className="m-1 shrink-0" />
+      label="New Draft"
+    />
+  );
+}
+
+export function NewDraftSecondaryButton(props: { publication: string }) {
+  let router = useRouter();
+
   return (
-    <div className="flex gap-2">
-      <ButtonPrimary
-        onClick={async () => {
-          let newLeaflet = await createPublicationDraft(props.publication);
-          router.push(`/${newLeaflet}`);
-        }}
-      >
-        New Draft
-      </ButtonPrimary>
-    </div>
+    <ButtonSecondary
+      fullWidth
+      id="new-leaflet-button"
+      onClick={async () => {
+        let newLeaflet = await createPublicationDraft(props.publication);
+        router.push(`/${newLeaflet}`);
+      }}
+    >
+      <AddTiny className="m-1 shrink-0" />
+      <span>New Post</span>
+    </ButtonSecondary>
   );
 }
diff --git a/app/lish/[handle]/[publication]/PublicationDashboard.tsx b/app/lish/[handle]/[publication]/PublicationDashboard.tsx
index 72420f14..0e069f7b 100644
--- a/app/lish/[handle]/[publication]/PublicationDashboard.tsx
+++ b/app/lish/[handle]/[publication]/PublicationDashboard.tsx
@@ -11,22 +11,30 @@ export function PublicationDashboard<T extends Tabs>(props: {
   let content = props.tabs[tab];
   return (
     <div className="w-full flex flex-col items-stretch">
-      <div className="flex flex-row w-full justify-between border-b border-secondary text-secondary">
+      <div className="flex flex-row w-full justify-between border-b border-border text-secondary">
         <div>{props.name}</div>
         <div className="flex flex-row gap-2">
           {Object.keys(props.tabs).map((t) => (
-            <Tab name={t} selected={t === tab} onSelect={() => setTab(t)} />
+            <Tab
+              key={t}
+              name={t}
+              selected={t === tab}
+              onSelect={() => setTab(t)}
+            />
           ))}
         </div>
       </div>
-      <div>{content}</div>
+      <div className="pt-4">{content}</div>
     </div>
   );
 }
 
 function Tab(props: { name: string; selected: boolean; onSelect: () => void }) {
   return (
-    <div className="border" onClick={() => props.onSelect()}>
+    <div
+      className={`border bg-bg-page  border-b-0 px-2 pt-1 rounded-t-md border-border ${props.selected ? "text-accent-1 font-bold -mb-[1px]" : ""}`}
+      onClick={() => props.onSelect()}
+    >
       {props.name}
     </div>
   );
diff --git a/app/lish/[handle]/[publication]/page.tsx b/app/lish/[handle]/[publication]/page.tsx
index 651b0572..d8612d89 100644
--- a/app/lish/[handle]/[publication]/page.tsx
+++ b/app/lish/[handle]/[publication]/page.tsx
@@ -9,8 +9,11 @@ import { Sidebar } from "components/ActionBar/Sidebar";
 import { Media } from "components/Media";
 import { Footer } from "components/ActionBar/Footer";
 import { PublicationDashboard } from "./PublicationDashboard";
-import { AddTiny } from "components/Icons/AddTiny";
 import { DraftList } from "./DraftList";
+import { NewDraftActionButton } from "./NewDraftButton";
+import { use } from "react";
+import { IdentityContext } from "components/IdentityProvider";
+import { getIdentityData } from "actions/getIdentityData";
 
 const idResolver = new IdResolver();
 
@@ -32,20 +35,31 @@ export async function generateMetadata(props: {
   return { title: decodeURIComponent((await props.params).publication) };
 }
 
+//This is the admin dashboard of the publication
 export default async function Publication(props: {
   params: Promise<{ publication: string; handle: string }>;
 }) {
+  let identity = await getIdentityData();
+  if (!identity || !identity.atp_did) return <PubNotFound />;
   let did = await idResolver.handle.resolve((await props.params).handle);
   if (!did) return <PubNotFound />;
   let { data: publication } = await supabaseServerClient
     .from("publications")
     .select(
-      "*, documents_in_publications(documents(*)), leaflets_in_publications(*, permission_tokens(*, permission_token_rights(*), custom_domain_routes!custom_domain_routes_edit_permission_token_fkey(*) ))",
+      `*,
+      documents_in_publications(documents(*)),
+      leaflets_in_publications(*,
+        permission_tokens(*,
+          permission_token_rights(*),
+          custom_domain_routes!custom_domain_routes_edit_permission_token_fkey(*)
+       )
+      )`,
     )
     .eq("identity_did", did)
     .eq("name", decodeURIComponent((await props.params).publication))
     .single();
-  if (!publication) return <PubNotFound />;
+  if (!publication || identity.atp_did !== publication.identity_did)
+    return <PubNotFound />;
 
   let all_facts = await supabaseServerClient.rpc("get_facts_for_roots", {
     max_depth: 2,
@@ -69,12 +83,7 @@ export default async function Publication(props: {
     return (
       <div className="relative max-w-screen-lg w-full h-full mx-auto flex sm:flex-row flex-col sm:items-stretch sm:px-6">
         <Sidebar className="mt-6 p-2">
-          <ActionButton
-            id="new-leaflet-button"
-            primary
-            icon=<AddTiny className="m-1 shrink-0" />
-            label="Create Draft"
-          />
+          <Actions publication={publication.uri} />
         </Sidebar>
         <div className={`h-full overflow-y-scroll pl-8 pt-8 w-full`}>
           <PublicationDashboard
@@ -82,6 +91,7 @@ export default async function Publication(props: {
             tabs={{
               Drafts: (
                 <DraftList
+                  publication={publication.uri}
                   drafts={publication.leaflets_in_publications.map((d) => ({
                     ...d.permission_tokens!,
                     initialFacts: facts[d.permission_tokens?.root_entity!],
@@ -95,12 +105,7 @@ export default async function Publication(props: {
         </div>
         <Media mobile>
           <Footer>
-            <ActionButton
-              id="new-leaflet-button"
-              primary
-              icon=<AddTiny className="m-1 shrink-0" />
-              label="New Doc"
-            />
+            <Actions publication={publication.uri} />
           </Footer>
         </Media>
       </div>
@@ -115,15 +120,10 @@ const PubNotFound = () => {
   return <div>ain't no pub here</div>;
 };
 
-const Actions = () => {
+const Actions = (props: { publication: string }) => {
   return (
     <>
-      <ActionButton
-        id="new-leaflet-button"
-        primary
-        icon=<AddTiny className="m-1 shrink-0" />
-        label="Create Draft"
-      />
+      <NewDraftActionButton publication={props.publication} />
     </>
   );
 };