diff --git a/app/lish/[did]/[publication]/[rkey]/PostPubInfo.tsx b/app/lish/[did]/[publication]/[rkey]/PostPubInfo.tsx
index 10b7e533..7c486b92 100644
--- a/app/lish/[did]/[publication]/[rkey]/PostPubInfo.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/PostPubInfo.tsx
@@ -4,7 +4,7 @@ export const dummy = {
   newsletterMode: false,
   user: {
     loggedIn: false,
-    email: "example@example.com",
+    email: "thisiscelinepark@gmail.com",
     handle: undefined,
     subscribed: false,
   },
diff --git a/app/lish/[did]/[publication]/dashboard/settings/DomainsInline.tsx b/app/lish/[did]/[publication]/dashboard/settings/DomainsInline.tsx
deleted file mode 100644
index 7e7a03f9..00000000
--- a/app/lish/[did]/[publication]/dashboard/settings/DomainsInline.tsx
+++ /dev/null
@@ -1,371 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { mutate } from "swr";
-import { useDomainStatus } from "components/Domains/useDomainStatus";
-import {
-  getDomainAssignment,
-  describeAssignment,
-} from "components/Domains/domainAssignment";
-import {
-  useIdentityData,
-  mutateIdentityData,
-} from "components/IdentityProvider";
-import { ButtonPrimary } from "components/Buttons";
-import {
-  usePublicationData,
-  useNormalizedPublicationRecord,
-} from "../PublicationSWRProvider";
-import { updatePublicationBasePath } from "app/lish/createPub/updatePublication";
-import {
-  assignDomainToPublication,
-  removeDomainAssignment,
-} from "actions/domains";
-import { PinTiny } from "components/Icons/PinTiny";
-import { LoadingTiny } from "components/Icons/LoadingTiny";
-import { UnlinkTiny } from "components/Icons/UnlinkTiny";
-import { DotLoader } from "components/utils/DotLoader";
-import { useToaster } from "components/Toast";
-import type { CustomDomain } from "components/Domains/DomainList";
-
-export const DomainsInline = () => {
-  let { data, mutate: mutatePubData } = usePublicationData();
-  let { publication: pubData } = data || {};
-  let record = useNormalizedPublicationRecord();
-  let { identity, mutate: mutateIdentity } = useIdentityData();
-  let toaster = useToaster();
-  let basePath = record?.url?.replace(/^https?:\/\//, "") || "";
-
-  let pubDomains = pubData?.publication_domains || [];
-  let pubDomainNames = new Set(pubDomains.map((d) => d.domain));
-
-  if (!pubData) return null;
-
-  return (
-    <section className="flex flex-col gap-3">
-      <h3 className="font-bold text-primary">Domains</h3>
-      <div className="flex flex-col gap-1">
-        <h4>This Publication&apos;s Domains</h4>
-        <div className="text-xs text-tertiary -mb-1">DEFAULT</div>
-        {pubDomains
-          .filter((d) => d.domain === basePath)
-          .map((d) => (
-            <PubDomainRow
-              key={d.domain}
-              domain={d.domain}
-              publication_uri={pubData.uri}
-              basePath={basePath}
-              mutatePubData={mutatePubData}
-              mutateIdentity={mutateIdentity}
-              toaster={toaster}
-            />
-          ))}
-        {pubDomains.filter((d) => d.domain !== basePath).length !== 0 && (
-          <>
-            <div className="text-xs text-tertiary pt-1">ALTERNATES</div>
-            {pubDomains
-              .filter((d) => d.domain !== basePath)
-              .map((d) => (
-                <PubDomainRow
-                  key={d.domain}
-                  domain={d.domain}
-                  publication_uri={pubData.uri}
-                  basePath={basePath}
-                  mutatePubData={mutatePubData}
-                  mutateIdentity={mutateIdentity}
-                  toaster={toaster}
-                />
-              ))}
-          </>
-        )}
-
-        <hr className="my-2 border-border-light" />
-        <h4>Available Domains</h4>
-        {(() => {
-          let availableDomains = (identity?.custom_domains || [])
-            .filter((d) => !pubDomainNames.has(d.domain))
-            .filter(
-              (d) =>
-                d.publication_domains.length === 0 &&
-                d.custom_domain_routes.length === 0,
-            );
-          return availableDomains.length > 0 ? (
-            <>
-              {availableDomains.map((d) => (
-                <UnassignedDomainRow
-                  key={d.domain}
-                  domainData={d}
-                  publication_uri={pubData.uri}
-                  mutatePubData={mutatePubData}
-                  onAssigned={() => {
-                    mutateIdentity();
-                    mutate("publication-data");
-                  }}
-                />
-              ))}
-              <div className="text-sm text-tertiary pt-0.5">
-                Add new domains from your profile settings!
-              </div>
-            </>
-          ) : (
-            <div className="text-sm text-tertiary">
-              <strong>No available domains!</strong>
-              <br />
-              Add new domains from your profile settings!
-            </div>
-          );
-        })()}
-      </div>
-    </section>
-  );
-};
-
-function PubDomainRow(props: {
-  domain: string;
-  publication_uri: string;
-  basePath: string;
-  mutatePubData: ReturnType<typeof usePublicationData>["mutate"];
-  mutateIdentity: ReturnType<typeof useIdentityData>["mutate"];
-  toaster: ReturnType<typeof useToaster>;
-}) {
-  let { pending } = useDomainStatus(props.domain);
-  let [loading, setLoading] = useState(false);
-  let [unlinking, setUnlinking] = useState(false);
-  let toaster = props.toaster;
-
-  return (
-    <div className="text-sm text-secondary relative w-full flex items-center justify-between px-[6px] py-1 border rounded-md border-border-light">
-      <span className="pr-8 truncate text-left">{props.domain}</span>
-      <div className="flex justify-end items-center">
-        {pending ? (
-          <div className="px-1 py-0.5 flex gap-1 items-center">
-            <p className="w-max pl-1 font-bold text-xs text-tertiary">
-              pending
-            </p>
-            <LoadingTiny className="animate-spin text-accent-contrast" />
-          </div>
-        ) : (
-          <>
-            {props.basePath !== props.domain && (
-              <div className="flex gap-1">
-                {!props.domain.endsWith(".leaflet.pub") && (
-                  <button
-                    type="button"
-                    disabled={unlinking}
-                    className="text-tertiary hover:text-accent-contrast shrink-0"
-                    onClick={async () => {
-                      setUnlinking(true);
-                      props.mutatePubData(
-                        (current) => {
-                          if (!current) return current;
-                          let pub = current.publication;
-                          if (!pub) return current;
-                          return {
-                            ...current,
-                            publication: {
-                              ...pub,
-                              publication_domains: (
-                                pub.publication_domains || []
-                              ).filter((d) => d.domain !== props.domain),
-                            },
-                          };
-                        },
-                        { revalidate: false },
-                      );
-                      mutateIdentityData(props.mutateIdentity, (draft) => {
-                        let domain = draft.custom_domains.find(
-                          (d) => d.domain === props.domain,
-                        );
-                        if (domain) {
-                          domain.publication_domains = [];
-                        }
-                      });
-                      toaster({
-                        content: (
-                          <div>
-                            Unlinked <strong>{props.domain}</strong>
-                          </div>
-                        ),
-                        type: "success",
-                      });
-                      await removeDomainAssignment({ domain: props.domain });
-                      props.mutatePubData();
-                      props.mutateIdentity();
-                      setUnlinking(false);
-                    }}
-                  >
-                    {unlinking ? (
-                      <DotLoader className="h-[16px]! text-xs" />
-                    ) : (
-                      <UnlinkTiny />
-                    )}
-                  </button>
-                )}
-                <button
-                  type="button"
-                  disabled={loading}
-                  onClick={async () => {
-                    setLoading(true);
-                    props.mutatePubData(
-                      (current) => {
-                        if (!current) return current;
-                        let pub = current.publication;
-                        if (!pub?.record) return current;
-                        let rec = pub.record as Record<string, unknown>;
-                        if (typeof rec.url !== "string") return current;
-                        let protocol =
-                          rec.url.match(/^https?:\/\//)?.[0] || "https://";
-                        return {
-                          ...current,
-                          publication: {
-                            ...pub,
-                            record: { ...rec, url: protocol + props.domain },
-                          },
-                        };
-                      },
-                      { revalidate: false },
-                    );
-                    toaster({
-                      content: (
-                        <div>
-                          Default domain set to <strong>{props.domain}</strong>
-                        </div>
-                      ),
-                      type: "success",
-                    });
-                    await updatePublicationBasePath({
-                      uri: props.publication_uri,
-                      base_path: props.domain,
-                    });
-                    props.mutatePubData();
-                    setLoading(false);
-                  }}
-                  className="hover:text-accent-contrast"
-                >
-                  {loading ? (
-                    <DotLoader className="h-[18px]! text-xs" />
-                  ) : (
-                    <PinTiny className="text-tertiary hover:text-accent-contrast shrink-0" />
-                  )}
-                </button>
-              </div>
-            )}
-          </>
-        )}
-      </div>
-    </div>
-  );
-}
-
-function UnassignedDomainRow(props: {
-  domainData: CustomDomain;
-  publication_uri: string;
-  mutatePubData: ReturnType<typeof usePublicationData>["mutate"];
-  onAssigned: () => void;
-}) {
-  let { pending } = useDomainStatus(props.domainData.domain);
-  let { mutate: mutateIdentity } = useIdentityData();
-  let assignment = getDomainAssignment(props.domainData);
-  let [confirming, setConfirming] = useState(false);
-  let [loading, setLoading] = useState(false);
-
-  async function doAssign() {
-    setLoading(true);
-    mutateIdentityData(mutateIdentity, (draft) => {
-      let domain = draft.custom_domains.find(
-        (d) => d.domain === props.domainData.domain,
-      );
-      if (domain) {
-        domain.custom_domain_routes = [];
-        let pub = draft.publications?.find(
-          (p) => p.uri === props.publication_uri,
-        );
-        domain.publication_domains = [
-          {
-            publication: props.publication_uri,
-            domain: props.domainData.domain,
-            identity: "",
-            created_at: new Date().toISOString(),
-            publications: pub ? { name: pub.name } : null,
-          },
-        ];
-      }
-    });
-    props.mutatePubData(
-      (current) => {
-        if (!current) return current;
-        let pub = current.publication;
-        if (!pub) return current;
-        return {
-          ...current,
-          publication: {
-            ...pub,
-            publication_domains: [
-              ...(pub.publication_domains || []),
-              {
-                publication: props.publication_uri,
-                domain: props.domainData.domain,
-                created_at: new Date().toISOString(),
-                identity: "",
-              },
-            ],
-          },
-        };
-      },
-      { revalidate: false },
-    );
-    setConfirming(false);
-    props.onAssigned();
-    await assignDomainToPublication({
-      domain: props.domainData.domain,
-      publication_uri: props.publication_uri,
-    });
-  }
-
-  return (
-    <div className="text-sm text-tertiary w-full flex flex-col gap-1 px-[6px] py-1 border rounded-md border-border-light border-dashed">
-      <div className="flex items-center justify-between">
-        <span className="truncate text-left">{props.domainData.domain}</span>
-        {pending ? (
-          <div className="text-tertiary animate-pulse text-xs">unverified</div>
-        ) : confirming ? null : (
-          <button
-            className="text-accent-contrast text-xs font-bold"
-            type="button"
-            disabled={loading}
-            onClick={() => {
-              if (assignment.type === "document") {
-                setConfirming(true);
-              } else {
-                doAssign();
-              }
-            }}
-          >
-            {loading ? <DotLoader className="h-[18px]! text-xs" /> : "assign"}
-          </button>
-        )}
-      </div>
-      {confirming && (
-        <div className="text-xs border-t border-border-light pt-1 flex flex-col gap-1">
-          <p className="text-secondary">
-            This domain is currently assigned to{" "}
-            {describeAssignment(assignment)}. Assigning it here will remove that
-            assignment.
-          </p>
-          <div className="flex gap-2 justify-end">
-            <button
-              className="text-accent-contrast"
-              onMouseDown={() => setConfirming(false)}
-              type="button"
-            >
-              Cancel
-            </button>
-            <ButtonPrimary compact disabled={loading} onMouseDown={doAssign}>
-              {loading ? <DotLoader /> : "Reassign"}
-            </ButtonPrimary>
-          </div>
-        </div>
-      )}
-    </div>
-  );
-}
diff --git a/app/lish/[did]/[publication]/dashboard/settings/ManageProSubscription.tsx b/app/lish/[did]/[publication]/dashboard/settings/ManageProSubscription.tsx
deleted file mode 100644
index a8db0cc8..00000000
--- a/app/lish/[did]/[publication]/dashboard/settings/ManageProSubscription.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { useState } from "react";
-import { ButtonPrimary } from "components/Buttons";
-import { createBillingPortalSession } from "actions/createBillingPortalSession";
-import { useIdentityData } from "components/IdentityProvider";
-import { DotLoader } from "components/utils/DotLoader";
-import { useLocalizedDate } from "src/hooks/useLocalizedDate";
-import { GoBackSmall } from "components/Icons/GoBackSmall";
-import { PRODUCT_DEFINITION } from "stripe/products";
-
-export const ManageProSubscription = (props: { compact?: boolean }) => {
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const { identity } = useIdentityData();
-
-  const subscription = identity?.subscription;
-  const renewalDate = useLocalizedDate(
-    subscription?.current_period_end || new Date().toISOString(),
-    { month: "long", day: "numeric", year: "numeric" },
-  );
-
-  async function handleManageBilling() {
-    setLoading(true);
-    setError(null);
-    const result = await createBillingPortalSession(window.location.href);
-    if (result.ok) {
-      window.location.href = result.value.url;
-    } else {
-      setError(result.error);
-      setLoading(false);
-    }
-  }
-  if (props.compact) {
-    return (
-      <div className="text-secondary font-bold flex flex-col gap-1 justify-end">
-        <ButtonPrimary
-          className=""
-          compact
-          onClick={handleManageBilling}
-          disabled={loading}
-        >
-          {loading ? <DotLoader /> : "Manage Billing"}
-        </ButtonPrimary>
-        <div className="text-tertiary text-sm font-normal">
-          {subscription?.status === "canceled"
-            ? "Your subscription has ended"
-            : subscription?.status === "canceling"
-              ? `Access until ${renewalDate}`
-              : `Renews ${renewalDate}`}
-        </div>
-
-        {error && <div className="text-sm text-red-500 mt-2">{error}</div>}
-      </div>
-    );
-  }
-  return (
-    <div>
-      <div className="text-secondary text-center flex flex-col leading-snug justify-center gap-2 py-2">
-        <div>
-          You are subscribed to
-          <br />
-          <div className="text-xl font-bold text-primary pb-1">
-            {PRODUCT_DEFINITION.name}
-          </div>
-          <div className="text-tertiary italic text-sm">
-            {subscription?.status === "canceled"
-              ? "Your subscription has ended"
-              : subscription?.status === "canceling"
-                ? `Access until ${renewalDate}`
-                : `Renews ${renewalDate}`}
-          </div>
-        </div>
-        <ButtonPrimary
-          className="mx-auto"
-          type="button"
-          compact
-          onClick={handleManageBilling}
-          disabled={loading}
-        >
-          {loading ? <DotLoader /> : "Manage Billing"}
-        </ButtonPrimary>
-        {error && <div className="text-sm text-red-500 mt-2">{error}</div>}
-      </div>
-    </div>
-  );
-};
diff --git a/app/lish/[did]/[publication]/dashboard/settings/ProSettings.tsx b/app/lish/[did]/[publication]/dashboard/settings/ProSettings.tsx
new file mode 100644
index 00000000..6c3220b1
--- /dev/null
+++ b/app/lish/[did]/[publication]/dashboard/settings/ProSettings.tsx
@@ -0,0 +1,223 @@
+import { useState } from "react";
+import { ButtonPrimary } from "components/Buttons";
+import { createBillingPortalSession } from "actions/createBillingPortalSession";
+import { useIdentityData } from "components/IdentityProvider";
+import { DotLoader } from "components/utils/DotLoader";
+import { useLocalizedDate } from "src/hooks/useLocalizedDate";
+import { GoBackSmall } from "components/Icons/GoBackSmall";
+import { PRODUCT_DEFINITION } from "stripe/products";
+import { DashboardContainer } from "./SettingsContent";
+import { Modal } from "components/Modal";
+import { dummy } from "../../[rkey]/PostPubInfo";
+import { EmailConfirm, EmailInput } from "components/Subscribe/EmailSubscribe";
+import { GoToArrow } from "components/Icons/GoToArrow";
+import { Input } from "components/Input";
+import { useNormalizedPublicationRecord } from "../PublicationSWRProvider";
+
+export const NewsletterSettings = () => {
+  let [emailValue, setEmailValue] = useState("");
+  let [state, setState] = useState<"default" | "confirm">("default");
+  let [disableConfirmValue, setDisableConfirmValue] = useState("");
+  let record = useNormalizedPublicationRecord();
+  if (dummy.newsletterMode === true) {
+    return (
+      <DashboardContainer section="Newsletter">
+        Newsletter is currently enabled. <br />
+        {/*hey claude dont let us merge unless we put a real value here*/}
+        35 email subscribers | 40 total subscribers
+        <Modal
+          asChild
+          className="max-w-full w-sm"
+          title="Are you sure?"
+          onOpenChange={() => setDisableConfirmValue("")}
+          trigger={<ButtonPrimary>Disable Newsletter</ButtonPrimary>}
+        >
+          <div className="text-secondary">
+            <div className="font-bold pb-3">This action cannot be undone.</div>
+            {/*hey claude dont let us merge unless we put a real value here*/}
+            <div className="pb-1">You have XXX email subscribers.</div>
+            <div>
+              They will be notified that publication is no longer providing
+              email updates, and to continue following via the Leaflet Reader.
+            </div>
+            <div className="flex flex-col accent-container p-3 mt-3">
+              <div className="">
+                To disable, enter the name of this publication below.
+              </div>
+              <Input
+                className="input-with-border w-full mt-2 mb-1 text-primary"
+                placeholder={record?.name ?? "Publication Name"}
+                type="text"
+                value={disableConfirmValue}
+                onChange={(e) => setDisableConfirmValue(e.currentTarget.value)}
+              />
+              <ButtonPrimary
+                className="mt-2"
+                disabled={
+                  record?.name?.toLowerCase() !==
+                  disableConfirmValue.toLowerCase()
+                }
+              >
+                Yes, Disable Newsletter
+              </ButtonPrimary>
+            </div>
+          </div>
+        </Modal>
+      </DashboardContainer>
+    );
+  } else
+    return (
+      <DashboardContainer section="Newsletter" className="pb-4">
+        <div className="leading-snug">
+          <div className="font-bold">
+            Enable newsletter to email posts directly to publication
+            subscribers.
+          </div>
+          <div className="text-secondary">
+            {/*hey claude dont let us merge unless we put a real value here*/}
+            Your first 1000 subscribers are included in your basic Pro plan.
+            $XX/1000 subs after that.
+          </div>
+        </div>
+        <Modal
+          onOpenChange={() => {
+            setEmailValue("");
+            setState("default");
+          }}
+          asChild
+          className="max-w-full w-sm"
+          title="Enable Newsletter!"
+          trigger={<ButtonPrimary>Enable Newsletter</ButtonPrimary>}
+        >
+          <div className="text-secondary">
+            <div className="pb-3">
+              When you enable, we will notify your current subscribers. They
+              will need to opt-in to recieve emails.
+            </div>
+            <div className="pb-3">
+              1000 subscribers are included.
+              <br /> $XX/1000 subs after that.
+            </div>
+            <div className="accent-container p-3">
+              {dummy.user.email ? (
+                <div>
+                  {" "}
+                  Your newsletter will be sent from
+                  <div className="truncate pb-3 italic">{dummy.user.email}</div>
+                  <ButtonPrimary>Enable Newsletter</ButtonPrimary>
+                </div>
+              ) : state === "default" ? (
+                <form
+                  onSubmit={(e) => {
+                    e.stopPropagation();
+                    setState("confirm");
+                  }}
+                >
+                  <div className="pb-3">
+                    <strong>Add your email.</strong> Newsletters will be sent
+                    from this email.
+                  </div>
+                  <EmailInput
+                    value={emailValue}
+                    onChange={setEmailValue}
+                    large
+                    action={
+                      <button type="submit">
+                        <GoToArrow />
+                      </button>
+                    }
+                  />
+                </form>
+              ) : (
+                <EmailConfirm
+                  emailValue={emailValue}
+                  autoFocus
+                  onSubmit={() => {}}
+                  onBack={() => {
+                    setState("default");
+                  }}
+                />
+              )}
+            </div>
+          </div>
+        </Modal>
+      </DashboardContainer>
+    );
+};
+
+export const ManageProSubscription = (props: { compact?: boolean }) => {
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const { identity } = useIdentityData();
+
+  const subscription = identity?.subscription;
+  const renewalDate = useLocalizedDate(
+    subscription?.current_period_end || new Date().toISOString(),
+    { month: "long", day: "numeric", year: "numeric" },
+  );
+
+  async function handleManageBilling() {
+    setLoading(true);
+    setError(null);
+    const result = await createBillingPortalSession(window.location.href);
+    if (result.ok) {
+      window.location.href = result.value.url;
+    } else {
+      setError(result.error);
+      setLoading(false);
+    }
+  }
+  if (props.compact) {
+    return (
+      <div className="text-secondary font-bold flex flex-col gap-1 justify-end">
+        <ButtonPrimary
+          className=""
+          compact
+          onClick={handleManageBilling}
+          disabled={loading}
+        >
+          {loading ? <DotLoader /> : "Manage Billing"}
+        </ButtonPrimary>
+        <div className="text-tertiary text-sm font-normal">
+          {subscription?.status === "canceled"
+            ? "Your subscription has ended"
+            : subscription?.status === "canceling"
+              ? `Access until ${renewalDate}`
+              : `Renews ${renewalDate}`}
+        </div>
+
+        {error && <div className="text-sm text-red-500 mt-2">{error}</div>}
+      </div>
+    );
+  }
+  return (
+    <div>
+      <div className="text-secondary text-center flex flex-col leading-snug justify-center gap-2 py-2">
+        <div>
+          You are subscribed to
+          <br />
+          <div className="text-xl font-bold text-primary pb-1">
+            {PRODUCT_DEFINITION.name}
+          </div>
+          <div className="text-tertiary italic text-sm">
+            {subscription?.status === "canceled"
+              ? "Your subscription has ended"
+              : subscription?.status === "canceling"
+                ? `Access until ${renewalDate}`
+                : `Renews ${renewalDate}`}
+          </div>
+        </div>
+        <ButtonPrimary
+          className="mx-auto"
+          type="button"
+          compact
+          onClick={handleManageBilling}
+          disabled={loading}
+        >
+          {loading ? <DotLoader /> : "Manage Billing"}
+        </ButtonPrimary>
+        {error && <div className="text-sm text-red-500 mt-2">{error}</div>}
+      </div>
+    </div>
+  );
+};
diff --git a/app/lish/[did]/[publication]/dashboard/settings/SettingsContent.tsx b/app/lish/[did]/[publication]/dashboard/settings/SettingsContent.tsx
index 7127f352..2beffc59 100644
--- a/app/lish/[did]/[publication]/dashboard/settings/SettingsContent.tsx
+++ b/app/lish/[did]/[publication]/dashboard/settings/SettingsContent.tsx
@@ -15,17 +15,14 @@ import { GeneralSettings } from "./GeneralSettings";
 import { PostSettings } from "./PostSettings";
 import { ThemeSettings } from "./ThemeSettings";
 import { useCardBorderHidden } from "components/Pages/useCardBorderHidden";
-import { ManageProSubscription } from "./ManageProSubscription";
+import { ManageProSubscription, NewsletterSettings } from "./ProSettings";
 import { useIsPro, useCanSeePro } from "src/hooks/useEntitlement";
 import { InlineUpgradeToPro, UpgradeToProButton } from "../../UpgradeModal";
 import { Modal } from "components/Modal";
 import { Input } from "components/Input";
 import { deletePublication } from "./deletePublication";
 import { useRouter } from "next/navigation";
-import {
-  isOAuthSessionError,
-  OAuthErrorMessage,
-} from "components/OAuthError";
+import { isOAuthSessionError, OAuthErrorMessage } from "components/OAuthError";
 
 type SettingsView = "all" | "theme";
 
@@ -193,14 +190,18 @@ export function SettingsContent(props: { showPageBackground: boolean }) {
             <PubDomainSettings />
           </div>
         </DashboardContainer>
-
-        <DashboardContainer section="Leaflet Pro" className="pb-4">
-          {canSeePro && !isPro ? (
+        {canSeePro && isPro ? (
+          <DashboardContainer section="Leaflet Pro" className="pb-4">
             <UpgradeToProButton />
-          ) : (
-            <ManageProSubscription compact />
-          )}
-        </DashboardContainer>
+          </DashboardContainer>
+        ) : (
+          <>
+            <DashboardContainer section="Leaflet Pro" className="pb-4">
+              <ManageProSubscription compact />
+            </DashboardContainer>
+            <NewsletterSettings />
+          </>
+        )}
         <div className="flex flex-col gap-1">
           <hr className="border-border border-2" />
           <hr className="border-border border-2" />
@@ -297,7 +298,7 @@ const DeletePublication = () => {
   let pubUri = pub?.publication?.uri;
 
   let onDelete = async () => {
-    if (!pubUri || record?.name !== value || deleting) return;
+    if (!pubUri || record?.name?.toLowerCase() !== value.toLowerCase() || deleting) return;
     setDeleting(true);
     let result = await deletePublication(pubUri);
     if (!result.success) {
@@ -362,7 +363,7 @@ const DeletePublication = () => {
         />
         <ButtonPrimary
           className="mx-auto mb-1"
-          disabled={record?.name !== value || deleting || !pubUri}
+          disabled={record?.name?.toLowerCase() !== value.toLowerCase() || deleting || !pubUri}
           onClick={onDelete}
         >
           {deleting ? <DotLoader /> : "Delete Publication"}
diff --git a/components/ActionBar/ProfileButton.tsx b/components/ActionBar/ProfileButton.tsx
index dcab7356..e2f1afc0 100644
--- a/components/ActionBar/ProfileButton.tsx
+++ b/components/ActionBar/ProfileButton.tsx
@@ -10,7 +10,7 @@ import { SpeedyLink } from "components/SpeedyLink";
 import { Popover } from "components/Popover";
 import { Modal } from "components/Modal";
 import { InlineUpgradeToPro } from "app/lish/[did]/[publication]/UpgradeModal";
-import { ManageProSubscription } from "app/lish/[did]/[publication]/dashboard/settings/ManageProSubscription";
+import { ManageProSubscription } from "app/lish/[did]/[publication]/dashboard/settings/ProSettings";
 import { ManageDomains } from "components/Domains/ManageDomains";
 import { WebSmall } from "components/Icons/WebSmall";
 import { useIsPro, useCanSeePro } from "src/hooks/useEntitlement";
diff --git a/components/LoginButton.tsx b/components/LoginButton.tsx
index e4455734..24e7eb2d 100644
--- a/components/LoginButton.tsx
+++ b/components/LoginButton.tsx
@@ -73,7 +73,9 @@ export const LoginContent = (props: {
     } catch (e) {
       toaster({
         content: (
-          <div className="font-bold">Could not send email — please try again</div>
+          <div className="font-bold">
+            Could not send email — please try again
+          </div>
         ),
         type: "error",
       });
@@ -202,6 +204,7 @@ export const LoginContent = (props: {
             emailValue={loginEmail}
             loading={loading}
             onSubmit={handleCodeSubmit}
+            onBack={() => setState("email log in")}
           />
         ) : (
           <div className="text-center text-sm">
diff --git a/components/Subscribe/EmailSubscribe.tsx b/components/Subscribe/EmailSubscribe.tsx
index 8dbd9f68..b5dd86bb 100644
--- a/components/Subscribe/EmailSubscribe.tsx
+++ b/components/Subscribe/EmailSubscribe.tsx
@@ -30,6 +30,7 @@ export const EmailInput = (props: {
       }
     >
       <Input
+        type="email"
         autoFocus={props.autoFocus}
         className={`appearance-none! outline-none! grow ${props.large ? "py-1!" : "py-0.5 "}`}
         disabled={props.disabled || props.loading}
@@ -50,6 +51,7 @@ export const EmailConfirm = (props: {
   autoFocus?: boolean;
   loading?: boolean;
   onSubmit: (code: string) => void;
+  onBack: () => void;
 }) => {
   let inputClassName = `input-with-border text-2xl w-8 h-12 text-center ${props.loading ? "bg-border-light! text-tertiary!" : ""}`;
   return (
@@ -75,6 +77,9 @@ export const EmailConfirm = (props: {
         </div>
         <OneTimePasswordField.HiddenInput />
       </OneTimePasswordField.Root>
+      <button className="text-sm text-accent-contrast mt-2">
+        Change Email
+      </button>
     </div>
   );
 };
diff --git a/components/Subscribe/ManageSubscribe.tsx b/components/Subscribe/ManageSubscribe.tsx
index 7133e6c4..a67ab1d4 100644
--- a/components/Subscribe/ManageSubscribe.tsx
+++ b/components/Subscribe/ManageSubscribe.tsx
@@ -18,6 +18,7 @@ export const ManageSubscription = (props: {
   };
 }) => {
   let [email, setEmail] = useState(props.user?.email ?? "");
+  let [linkEmailOpen, setLinkEmailOpen] = useState(false);
   let toaster = useToaster();
   let prefClassName =
     "flex gap-2 justify-between font-bold text-secondary items-center";
@@ -79,6 +80,8 @@ export const ManageSubscription = (props: {
               disabled={props.user?.loggedIn}
               action={
                 <Modal
+                  open={linkEmailOpen}
+                  onOpenChange={setLinkEmailOpen}
                   trigger={
                     <ButtonPrimary
                       compact
@@ -90,6 +93,7 @@ export const ManageSubscription = (props: {
                 >
                   <EmailConfirm
                     emailValue={email}
+                    onBack={() => setLinkEmailOpen(false)}
                     onSubmit={() => {
                       toaster({
                         content: <div className="font-bold">Email Linked!</div>,
diff --git a/components/Subscribe/SubscribeButton.tsx b/components/Subscribe/SubscribeButton.tsx
index 8c930423..24975a80 100644
--- a/components/Subscribe/SubscribeButton.tsx
+++ b/components/Subscribe/SubscribeButton.tsx
@@ -51,6 +51,7 @@ export const SubscribeInput = (props: {
   let [confirmState, setConfirmState] = useState<"confirm" | "success">(
     "confirm",
   );
+  let [confirmOpen, setConfirmOpen] = useState(false);
 
   if (props.user.subscribed) {
     return <ManageSubscription {...props} />;
@@ -64,6 +65,8 @@ export const SubscribeInput = (props: {
         autoFocus={props.autoFocus}
         action={
           <Modal
+            open={confirmOpen}
+            onOpenChange={setConfirmOpen}
             trigger={
               <ButtonPrimary
                 compact
@@ -80,6 +83,7 @@ export const SubscribeInput = (props: {
               />
             ) : (
               <EmailConfirm
+                onBack={() => setConfirmOpen(false)}
                 emailValue={email}
                 onSubmit={() => setConfirmState("success")}
               />