diff --git a/app/(home-pages)/(writer)/home/HomeLayout.tsx b/app/(home-pages)/(writer)/home/HomeLayout.tsx
index db630f02..ad008f19 100644
--- a/app/(home-pages)/(writer)/home/HomeLayout.tsx
+++ b/app/(home-pages)/(writer)/home/HomeLayout.tsx
@@ -77,7 +77,7 @@ export const HomeContent = (props: {
       scrollKey="dashboard-home"
       pageTitle="Home"
       mobileActions={<CreateNewLeafletButton compact />}
-      search={
+      controls={
         <PageSearch
           defaultDisplay={"grid"}
           searchValue={searchValue}
@@ -87,6 +87,7 @@ export const HomeContent = (props: {
           hasArchived={!!hasArchived}
         />
       }
+      hasSearch
       showHeader={true}
     >
       <HomeLeafletList
diff --git a/app/lish/[did]/[publication]/dashboard/DraftsTab.tsx b/app/lish/[did]/[publication]/dashboard/DraftsTab.tsx
index 6f98b57b..d7f5c4cc 100644
--- a/app/lish/[did]/[publication]/dashboard/DraftsTab.tsx
+++ b/app/lish/[did]/[publication]/dashboard/DraftsTab.tsx
@@ -18,11 +18,9 @@ export function DraftsTab() {
 
   let [searchValue, setSearchValue] = useState("");
   let [debouncedSearchValue, setDebouncedSearchValue] = useState("");
-  useDebouncedEffect(
-    () => setDebouncedSearchValue(searchValue),
-    200,
-    [searchValue],
-  );
+  useDebouncedEffect(() => setDebouncedSearchValue(searchValue), 200, [
+    searchValue,
+  ]);
 
   const showPageBackground = !!record?.theme?.showPageBackground;
 
@@ -31,7 +29,7 @@ export function DraftsTab() {
       scrollKey={`dashboard-${pubUri}-Drafts`}
       pageTitle="Drafts"
       mobileActions={<NewDraftActionButton publication={pubUri} compact />}
-      search={
+      controls={
         <PageSearch
           defaultDisplay="list"
           hasBackgroundImage={!!record?.theme?.backgroundImage}
@@ -39,6 +37,7 @@ export function DraftsTab() {
           setSearchValueAction={setSearchValue}
         />
       }
+      hasSearch
       publication={pubUri}
       showHeader={true}
     >
diff --git a/app/lish/[did]/[publication]/dashboard/PublicationAnalytics.tsx b/app/lish/[did]/[publication]/dashboard/PublicationAnalytics.tsx
index 7e84ed17..a70155f3 100644
--- a/app/lish/[did]/[publication]/dashboard/PublicationAnalytics.tsx
+++ b/app/lish/[did]/[publication]/dashboard/PublicationAnalytics.tsx
@@ -24,7 +24,56 @@ import {
 type ReferrerType = { referrer_host: string; pageviews: number };
 type TrafficMetric = "pageviews" | "visitors";
 type DatePreset = "Last Week" | "Last Month" | "All Time";
-type DateSelection = { range: DateRange; preset: DatePreset | null };
+export type DateSelection = { range: DateRange; preset: DatePreset | null };
+
+// URL params:
+//   ?date=all        → All Time (no from/to bounds)
+//   ?date=month      → Last Month preset
+//   ?from=YYYY-MM-DD&to=YYYY-MM-DD → custom range
+//   (none)           → default: Last Week
+export function useAnalyticsDateState() {
+  return useQueryState<DateSelection>({
+    fromParams: (get) => {
+      let preset = get("date");
+      if (preset === "all")
+        return {
+          range: { from: undefined, to: undefined },
+          preset: "All Time",
+        };
+      if (preset === "month") {
+        let from = new Date();
+        from.setMonth(from.getMonth() - 1);
+        return { range: { from, to: new Date() }, preset: "Last Month" };
+      }
+      let fromParam = get("from");
+      let toParam = get("to");
+      if (fromParam || toParam) {
+        return {
+          range: {
+            from: fromParam ? new Date(fromParam) : undefined,
+            to: toParam ? new Date(toParam) : new Date(),
+          },
+          preset: null,
+        };
+      }
+      let from = new Date();
+      from.setDate(from.getDate() - 7);
+      return { range: { from, to: new Date() }, preset: "Last Week" };
+    },
+    toParams: ({ preset, range }) => {
+      if (preset === "All Time")
+        return { date: "all", from: null, to: null };
+      if (preset === "Last Month")
+        return { date: "month", from: null, to: null };
+      if (preset === "Last Week") return { date: null, from: null, to: null };
+      return {
+        date: null,
+        from: range.from?.toISOString().slice(0, 10) ?? null,
+        to: range.to?.toISOString().slice(0, 10) ?? null,
+      };
+    },
+  });
+}
 
 const dayTickFormatter = new Intl.DateTimeFormat(undefined, {
   month: "short",
@@ -87,59 +136,15 @@ function fillDailyGaps<T extends { day: string }>(
 
 export const PublicationAnalytics = (props: {
   showPageBackground: boolean;
+  dateState: DateSelection;
 }) => {
   let isPro = useIsPro();
   let canSeePro = useCanSeePro();
 
   let { data: publication } = usePublicationData();
 
-  // URL params:
-  //   ?date=all        → All Time (no from/to bounds)
-  //   ?date=month      → Last Month preset
-  //   ?from=YYYY-MM-DD&to=YYYY-MM-DD → custom range
-  //   (none)           → default: Last Week
-  let [dateState, setDateState] = useQueryState<DateSelection>({
-    fromParams: (get) => {
-      let preset = get("date");
-      if (preset === "all")
-        return {
-          range: { from: undefined, to: undefined },
-          preset: "All Time",
-        };
-      if (preset === "month") {
-        let from = new Date();
-        from.setMonth(from.getMonth() - 1);
-        return { range: { from, to: new Date() }, preset: "Last Month" };
-      }
-      let fromParam = get("from");
-      let toParam = get("to");
-      if (fromParam || toParam) {
-        return {
-          range: {
-            from: fromParam ? new Date(fromParam) : undefined,
-            to: toParam ? new Date(toParam) : new Date(),
-          },
-          preset: null,
-        };
-      }
-      let from = new Date();
-      from.setDate(from.getDate() - 7);
-      return { range: { from, to: new Date() }, preset: "Last Week" };
-    },
-    toParams: ({ preset, range }) => {
-      if (preset === "All Time")
-        return { date: "all", from: null, to: null };
-      if (preset === "Last Month")
-        return { date: "month", from: null, to: null };
-      if (preset === "Last Week") return { date: null, from: null, to: null };
-      return {
-        date: null,
-        from: range.from?.toISOString().slice(0, 10) ?? null,
-        to: range.to?.toISOString().slice(0, 10) ?? null,
-      };
-    },
-  });
-  let { range: dateRange, preset: datePreset } = dateState;
+  let { dateState } = props;
+  let { range: dateRange } = dateState;
 
   // ?post=<path> — filter traffic to a single published post (path is the stable ID)
   let [selectedPostPath, setSelectedPostPath] = useQueryState<
@@ -258,14 +263,6 @@ export const PublicationAnalytics = (props: {
 
   return (
     <div className="analytics flex flex-col gap-6">
-      <div className="flex justify-end gap-2">
-        <DateRangeSelector
-          dateState={dateState}
-          setDateState={setDateState}
-          pubStartDate={publication?.publication?.indexed_at}
-          showBackground={props.showPageBackground}
-        />
-      </div>
       <div
         className={`analyticsViewCount rounded-lg border ${
           props.showPageBackground
@@ -646,7 +643,7 @@ const PostSelector = (props: {
   );
 };
 
-const DateRangeSelector = (props: {
+export const DateRangeSelector = (props: {
   pubStartDate: string | undefined;
   dateState: DateSelection;
   setDateState: (state: DateSelection) => void;
diff --git a/app/lish/[did]/[publication]/dashboard/PublicationSubscribers.tsx b/app/lish/[did]/[publication]/dashboard/PublicationSubscribers.tsx
index f7072058..809a9808 100644
--- a/app/lish/[did]/[publication]/dashboard/PublicationSubscribers.tsx
+++ b/app/lish/[did]/[publication]/dashboard/PublicationSubscribers.tsx
@@ -8,6 +8,8 @@ import { Separator } from "components/Layout";
 import { MoreOptionsVerticalTiny } from "components/Icons/MoreOptionsVerticalTiny";
 import { useLocalizedDate } from "src/hooks/useLocalizedDate";
 import { useDashboardState } from "components/PageLayouts/dashboardState";
+import { AtmosphereAccount } from "components/Icons/AtmosphereAccount";
+import { EmailTiny } from "components/Icons/EmailTiny";
 
 type subscriber = { email: string | undefined; did: string | undefined };
 
@@ -22,14 +24,11 @@ type MergedSubscriber = {
   status: SubscriberStatus;
 };
 
-export function PublicationSubscribers(props: {
-  showPageBackground?: boolean;
-}) {
-  let smoker = useSmoker();
+export function useMergedSubscribers(): MergedSubscriber[] | null {
   let { data: publication } = usePublicationData();
   let { subscriberStatus } = useDashboardState();
 
-  if (!publication) return <div>null</div>;
+  if (!publication) return null;
   // ATProto subscribers have no email lifecycle state — they're just present
   // or absent, so they only count under the "subscribed" status filter.
   let atprotoSubs = subscriberStatus.subscribed
@@ -84,7 +83,18 @@ export function PublicationSubscribers(props: {
       status,
     });
   }
-  let subscribers: MergedSubscriber[] = [...byDid.values(), ...emailOnly];
+  return [...byDid.values(), ...emailOnly];
+}
+
+export function PublicationSubscribers(props: {
+  showPageBackground?: boolean;
+}) {
+  let smoker = useSmoker();
+  let { data: publication } = usePublicationData();
+  let { subscriberStatus } = useDashboardState();
+  let subscribers = useMergedSubscribers();
+
+  if (!publication || !subscribers) return <div>null</div>;
 
   // useEffect(() => {
   //   const allSubscribersSelected = subscribers.every((subscriber) =>
@@ -118,7 +128,8 @@ export function PublicationSubscribers(props: {
               .join(", ");
       return (
         <div
-          className={`italic text-tertiary flex flex-col gap-0 text-center justify-center py-4 border rounded-md ${props.showPageBackground ? "border-border-light p-2" : "border-transparent"}`}
+          className={`italic text-tertiary
+            flex flex-col gap-0 text-center justify-center py-4 border rounded-md ${props.showPageBackground ? "border-border-light p-2" : "border-transparent"}`}
           style={
             props.showPageBackground
               ? {
@@ -128,14 +139,13 @@ export function PublicationSubscribers(props: {
               : { backgroundColor: "transparent" }
           }
         >
-          <p className="font-bold">No subscribers match this filter</p>
-          <p>Showing: {label}</p>
+          <p className="font-bold">No subscribers match your filters!</p>
         </div>
       );
     }
     return (
       <div
-        className={`italic text-tertiary  flex flex-col gap-0 text-center justify-center py-4 border rounded-md ${props.showPageBackground ? "border-border-light p-2" : "border-transparent"}`}
+        className={`italic text-tertiary flex flex-col gap-0 text-center justify-center py-4 border rounded-md ${props.showPageBackground ? "border-border-light p-2" : "border-transparent"}`}
         style={
           props.showPageBackground
             ? {
@@ -180,47 +190,21 @@ export function PublicationSubscribers(props: {
           : { backgroundColor: "transparent" }
       }
     >
-      {/*<div className="subscriberListHeader flex gap-2 ">
-        <Checkbox
-          checked={checkAll}
-          onChange={() => {
-            if (checkAll === false) {
-              const allSubscribers = subscribers.map((subscriber) => ({
-                email: "dummyemail@email.com",
-                did: subscriber.identities?.bsky_profiles?.did,
-              }));
-              setCheckedSubscribers(allSubscribers);
-            } else {
-              setCheckedSubscribers([]);
-            }
-          }}
-          className="!font-bold text-secondary mb-1"
-        >
-          {subscribers.length} Subscriber{subscribers.length !== 1 && "s"}
-        </Checkbox>
-        {checkedSubscribers.length !== 0 && (
-          <SubscriberOptions
-            checkedSubscribers={checkedSubscribers}
-            allSelected={checkedSubscribers.length === subscribers.length}
-          />
-        )}
-      </div>*/}
-      <div className="!font-bold text-secondary mb-1">
-        {subscribers.length} Subscriber{subscribers.length !== 1 && "s"}
-      </div>
-      <hr className="mb-2 border-border " />
-      <div className="subscriberListContent flex gap-3 flex-col ">
+      <div className="subscriberListContent flex gap-2 flex-col ">
         {subscribers
           .sort((a, b) => b.created_at.localeCompare(a.created_at))
           .map((subscriber) => (
-            <SubscriberListItem
-              key={subscriber.key}
-              handle={subscriber.handle}
-              did={subscriber.did}
-              email={subscriber.email}
-              createdAt={subscriber.created_at}
-              status={subscriber.status}
-            />
+            <>
+              <SubscriberListItem
+                key={subscriber.key}
+                handle={subscriber.handle}
+                did={subscriber.did}
+                email={subscriber.email}
+                createdAt={subscriber.created_at}
+                status={subscriber.status}
+              />
+              <hr className="border-border-light last:hidden" />
+            </>
           ))}
       </div>
     </div>
@@ -234,35 +218,47 @@ const SubscriberListItem = (props: {
   createdAt: string;
   status: SubscriberStatus;
 }) => {
+  let contactClassName =
+    "flex flex-row gap-2 items-center border rounded-md px-1 text-sm w-full max-w-fit no-underline! hover:bg-[var(--accent-light)] hover:border-accent-contrast ";
+  let subscribedClassName = " border-transparent font-bold text-secondary";
+  let mutedClassName = "border-border bg-border-light text-tertiary";
+  let unconfirmedClassName = "border-border-light animate-pulse text-tertiary";
+
   return (
-    <div className="flex items-end flex-row gap-2 w-full">
-      {props.handle && (
-        <a
-          target="_blank"
-          href={`https://bsky.app/profile/${props.did}`}
-          className="font-bold"
-        >
-          @{props.handle}
-        </a>
-      )}
-      {props.handle && props.email && (
-        <Separator classname="sm:block hidden" />
-      )}
-      {props.email && (
-        <a
-          target="_blank"
-          href={`mailto:${props.email}`}
-          className={`font-bold ${props.status === "subscribed" ? "text-primary" : "text-tertiary line-through"}`}
-        >
-          {props.email}
-        </a>
-      )}
-      {props.status !== "subscribed" && (
-        <span className="text-sm italic text-tertiary">
-          {props.status === "unconfirmed" ? "unconfirmed" : "unsubscribed"}
-        </span>
-      )}
-      <SubscriberDate createdAt={props.createdAt} />
+    <div className="flex flex-row justify-between gap-2 w-full">
+      <div className="flex flex-col gap-0.5 grow min-w-0 w-full">
+        {props.handle && (
+          <a
+            target="_blank"
+            href={`https://bsky.app/profile/${props.did}`}
+            className={`${contactClassName} ${props.status === "subscribed" ? subscribedClassName : props.status === "unconfirmed" ? unconfirmedClassName : mutedClassName}`}
+          >
+            <AtmosphereAccount className="text-tertiary shrink-0" />
+            {props.handle}
+          </a>
+        )}
+        {props.handle && props.email && (
+          <Separator classname="sm:block hidden" />
+        )}
+        {props.email && (
+          <a
+            target="_blank"
+            href={`mailto:${props.email}`}
+            className={`${contactClassName} ${props.status === "subscribed" ? subscribedClassName : props.status === "unconfirmed" ? unconfirmedClassName : mutedClassName}`}
+          >
+            <EmailTiny className="text-tertiary shrink-0" />{" "}
+            <div className="truncate min-w-0 ">{props.email}</div>
+          </a>
+        )}
+      </div>
+      <div className="flex flex-row gap-2 shrink-0">
+        {props.status !== "subscribed" && (
+          <span className="text-sm italic text-tertiary">
+            {props.status === "unconfirmed" ? "unconfirmed" : "unsubscribed"}
+          </span>
+        )}
+        <SubscriberDate createdAt={props.createdAt} />
+      </div>
     </div>
   );
 };
diff --git a/app/lish/[did]/[publication]/dashboard/analytics/page.tsx b/app/lish/[did]/[publication]/dashboard/analytics/page.tsx
index 491c56ea..6c85cfef 100644
--- a/app/lish/[did]/[publication]/dashboard/analytics/page.tsx
+++ b/app/lish/[did]/[publication]/dashboard/analytics/page.tsx
@@ -3,7 +3,11 @@
 import { useRouter } from "next/navigation";
 import { useEffect } from "react";
 import { DashboardPageLayout } from "components/PageLayouts/DashboardPageLayout";
-import { PublicationAnalytics } from "../PublicationAnalytics";
+import {
+  PublicationAnalytics,
+  DateRangeSelector,
+  useAnalyticsDateState,
+} from "../PublicationAnalytics";
 import { NewDraftActionButton } from "../NewDraftButton";
 import {
   usePublicationData,
@@ -19,6 +23,8 @@ export default function AnalyticsPage() {
   let pubUri = data?.publication?.uri || "";
   const showPageBackground = !!record?.theme?.showPageBackground;
 
+  let [dateState, setDateState] = useAnalyticsDateState();
+
   useEffect(() => {
     if (canSeePro === false) router.replace("../");
   }, [canSeePro, router]);
@@ -31,9 +37,22 @@ export default function AnalyticsPage() {
       pageTitle="Analytics"
       mobileActions={<NewDraftActionButton publication={pubUri} compact />}
       publication={pubUri}
-      showHeader={false}
+      showHeader={true}
+      controls={
+        <div className="flex justify-end gap-2">
+          <DateRangeSelector
+            dateState={dateState}
+            setDateState={setDateState}
+            pubStartDate={data?.publication?.indexed_at}
+            showBackground={showPageBackground}
+          />
+        </div>
+      }
     >
-      <PublicationAnalytics showPageBackground={showPageBackground} />
+      <PublicationAnalytics
+        showPageBackground={showPageBackground}
+        dateState={dateState}
+      />
     </DashboardPageLayout>
   );
 }
diff --git a/app/lish/[did]/[publication]/dashboard/subs/page.tsx b/app/lish/[did]/[publication]/dashboard/subs/page.tsx
index 5d6377c4..fd88c02c 100644
--- a/app/lish/[did]/[publication]/dashboard/subs/page.tsx
+++ b/app/lish/[did]/[publication]/dashboard/subs/page.tsx
@@ -1,32 +1,106 @@
 "use client";
 
 import { DashboardPageLayout } from "components/PageLayouts/DashboardPageLayout";
-import { SubscriberStatusFilter } from "components/PageLayouts/PageSearch";
-import { PublicationSubscribers } from "../PublicationSubscribers";
-import { NewDraftActionButton } from "../NewDraftButton";
+import {
+  PublicationSubscribers,
+  useMergedSubscribers,
+} from "../PublicationSubscribers";
 import {
   usePublicationData,
   useNormalizedPublicationRecord,
 } from "../PublicationSWRProvider";
+import { Popover } from "components/Popover";
+import { Checkbox } from "components/Checkbox";
+import {
+  useDashboardState,
+  useSetDashboardState,
+} from "components/PageLayouts/dashboardState";
 
 export default function SubsPage() {
   let { data } = usePublicationData();
   let record = useNormalizedPublicationRecord();
   let pubUri = data?.publication?.uri || "";
   const showPageBackground = !!record?.theme?.showPageBackground;
+  let subscribers = useMergedSubscribers();
+  let count = subscribers?.length ?? 0;
 
   return (
     <DashboardPageLayout
       scrollKey={`dashboard-${pubUri}-Subs`}
       pageTitle="Subscribers"
-      mobileActions={<NewDraftActionButton publication={pubUri} compact />}
+      mobileActions={<SubscriberStatusFilter />}
       publication={pubUri}
-      showHeader={false}
+      showHeader={true}
+      controls={
+        <div className="flex items-center justify-between gap-3 text-sm">
+          <div className="font-bold text-secondary px-1">
+            {count} Subscriber{count !== 1 && "s"}
+          </div>
+          <SubscriberStatusFilter />
+        </div>
+      }
     >
-      <div className="flex justify-end text-sm text-tertiary">
-        <SubscriberStatusFilter />
-      </div>
       <PublicationSubscribers showPageBackground={showPageBackground} />
     </DashboardPageLayout>
   );
 }
+
+const SubscriberStatusFilter = () => {
+  let { subscriberStatus } = useDashboardState();
+  let setState = useSetDashboardState();
+  let count = Object.values(subscriberStatus).filter(Boolean).length;
+
+  return (
+    <Popover
+      className="text-sm px-2! py-1!"
+      trigger={
+        <div className="text-sm text-tertiary">
+          Filters {count > 0 && `(${count})`}
+        </div>
+      }
+    >
+      <Checkbox
+        small
+        checked={subscriberStatus.subscribed}
+        onChange={(e) =>
+          setState({
+            subscriberStatus: {
+              ...subscriberStatus,
+              subscribed: !!e.target.checked,
+            },
+          })
+        }
+      >
+        Subscribed
+      </Checkbox>
+      <Checkbox
+        small
+        checked={subscriberStatus.unconfirmed}
+        onChange={(e) =>
+          setState({
+            subscriberStatus: {
+              ...subscriberStatus,
+              unconfirmed: !!e.target.checked,
+            },
+          })
+        }
+      >
+        Unconfirmed
+      </Checkbox>
+      <Checkbox
+        small
+        checked={subscriberStatus.unsubscribed}
+        onChange={(e) =>
+          setState({
+            subscriberStatus: {
+              ...subscriberStatus,
+              unsubscribed: !!e.target.checked,
+            },
+          })
+        }
+      >
+        Unsubscribed
+      </Checkbox>
+    </Popover>
+  );
+};
diff --git a/app/lish/[did]/[publication]/theme-settings/page.tsx b/app/lish/[did]/[publication]/theme-settings/page.tsx
index caffe8fd..80040b0d 100644
--- a/app/lish/[did]/[publication]/theme-settings/page.tsx
+++ b/app/lish/[did]/[publication]/theme-settings/page.tsx
@@ -6,6 +6,7 @@ import { AtUri } from "@atproto/syntax";
 import { NotFoundLayout } from "components/PageLayouts/NotFoundLayout";
 import { normalizePublicationRecord } from "src/utils/normalizeRecords";
 import { ThemeSettingsContent } from "./ThemeSettingsContent";
+import { LoginModal } from "components/LoginButton";
 
 export default async function ThemeSettingsPage(props: {
   params: Promise<{ publication: string; did: string }>;
@@ -15,13 +16,23 @@ export default async function ThemeSettingsPage(props: {
   if (!identity || !identity.atp_did)
     return (
       <NotFoundLayout>
-        <p>Looks like you&apos;re not logged in.</p>
+        <p>
+          Looks like you&apos;re not logged in.{" "}
+          <LoginModal
+            redirectRoute={`/lish/${params.did}/${params.publication}/dashboard`}
+            trigger={
+              <div className="text-accent-contrast font-bold">Log in here</div>
+            }
+          />
+          !
+        </p>
         <p>
           If the issue persists please{" "}
           <a href="mailto:contact@leaflet.pub">send us a note</a>.
         </p>
       </NotFoundLayout>
     );
+
   let did = decodeURIComponent(params.did);
   if (!did) return <ThemeNotFound />;
   let { result: publication_data } = await get_publication_data.handler(
diff --git a/components/ActionBar/MobileNavigation.tsx b/components/ActionBar/MobileNavigation.tsx
index 8c7093b3..bb31ef2a 100644
--- a/components/ActionBar/MobileNavigation.tsx
+++ b/components/ActionBar/MobileNavigation.tsx
@@ -11,7 +11,8 @@ import { useCardBorderHidden } from "components/Pages/useCardBorderHidden";
 import { useIdentityData } from "components/IdentityProvider";
 
 export const MobileNavigation = (props: {
-  search?: React.ReactNode;
+  controls?: React.ReactNode;
+  hasSearch?: boolean;
   mobileActions?: React.ReactNode;
   pageTitle: string;
   hiddenOnScroll?: boolean;
@@ -113,7 +114,7 @@ export const MobileNavigation = (props: {
               <MobileSidebarTrigger pageTitle={props.pageTitle} />
               <div className="flex-1" />
 
-              {props.search && (
+              {props.controls && props.hasSearch && (
                 <button
                   onClick={() => {
                     setState("search");
@@ -128,7 +129,7 @@ export const MobileNavigation = (props: {
             </>
           ) : (
             <>
-              {props.search}
+              {props.controls}
               <Separator classname="h-6!" />
               <button
                 className="text-secondary"
diff --git a/components/PageLayouts/DashboardPageLayout.tsx b/components/PageLayouts/DashboardPageLayout.tsx
index 7f03b5fe..a21dc7e2 100644
--- a/components/PageLayouts/DashboardPageLayout.tsx
+++ b/components/PageLayouts/DashboardPageLayout.tsx
@@ -7,7 +7,8 @@ export function DashboardPageLayout(props: {
   scrollKey: string;
   pageTitle: string;
   mobileActions?: React.ReactNode;
-  search?: React.ReactNode;
+  controls?: React.ReactNode;
+  hasSearch?: boolean;
   publication?: string;
   showHeader?: boolean;
   children: React.ReactNode;
@@ -29,7 +30,7 @@ export function DashboardPageLayout(props: {
       {props.showHeader && (
         <PageHeader>
           <div className={`sm:block ${props.publication && "hidden"} grow`}>
-            {props.search}
+            {props.controls}
           </div>
         </PageHeader>
       )}
@@ -38,7 +39,8 @@ export function DashboardPageLayout(props: {
       <MobileNavigation
         pageTitle={props.pageTitle}
         mobileActions={props.mobileActions}
-        search={props.search}
+        controls={props.controls}
+        hasSearch={props.hasSearch}
       />
     </div>
   );
diff --git a/components/PageLayouts/PageSearch.tsx b/components/PageLayouts/PageSearch.tsx
index 0aa751ab..8289b580 100644
--- a/components/PageLayouts/PageSearch.tsx
+++ b/components/PageLayouts/PageSearch.tsx
@@ -167,62 +167,6 @@ const FilterCheckboxes = (props: {
   );
 };
 
-export const SubscriberStatusFilter = () => {
-  let { subscriberStatus } = useDashboardState();
-  let setState = useSetDashboardState();
-  let count = Object.values(subscriberStatus).filter(Boolean).length;
-
-  return (
-    <Popover
-      className="text-sm px-2! py-1!"
-      trigger={<div>Status {count > 0 && `(${count})`}</div>}
-    >
-      <Checkbox
-        small
-        checked={subscriberStatus.subscribed}
-        onChange={(e) =>
-          setState({
-            subscriberStatus: {
-              ...subscriberStatus,
-              subscribed: !!e.target.checked,
-            },
-          })
-        }
-      >
-        Subscribed
-      </Checkbox>
-      <Checkbox
-        small
-        checked={subscriberStatus.unconfirmed}
-        onChange={(e) =>
-          setState({
-            subscriberStatus: {
-              ...subscriberStatus,
-              unconfirmed: !!e.target.checked,
-            },
-          })
-        }
-      >
-        Unconfirmed
-      </Checkbox>
-      <Checkbox
-        small
-        checked={subscriberStatus.unsubscribed}
-        onChange={(e) =>
-          setState({
-            subscriberStatus: {
-              ...subscriberStatus,
-              unsubscribed: !!e.target.checked,
-            },
-          })
-        }
-      >
-        Unsubscribed
-      </Checkbox>
-    </Popover>
-  );
-};
-
 const FilterOptions = (props: { hasPubs: boolean; hasArchived: boolean }) => {
   let { filter } = useDashboardState();
   let filterCount = Object.values(filter).filter(Boolean).length;