diff --git a/app/(home-pages)/p/[didOrHandle]/ProfileLayout.tsx b/app/(home-pages)/p/[didOrHandle]/ProfileLayout.tsx
index cf21528a..28d5bf65 100644
--- a/app/(home-pages)/p/[didOrHandle]/ProfileLayout.tsx
+++ b/app/(home-pages)/p/[didOrHandle]/ProfileLayout.tsx
@@ -14,7 +14,7 @@ export function ProfileLayout(props: { children: React.ReactNode }) {
               : "overflow-y-auto h-full border border-border-light rounded-lg! container px-3 sm:px-4 "
           }
           max-w-prose w-full
-          flex flex-col mb-3
+          flex flex-col
           text-center
     `}
     >
diff --git a/app/(home-pages)/p/[didOrHandle]/PubListing.tsx b/app/(home-pages)/p/[didOrHandle]/PubListing.tsx
index e948a047..0155e4b6 100644
--- a/app/(home-pages)/p/[didOrHandle]/PubListing.tsx
+++ b/app/(home-pages)/p/[didOrHandle]/PubListing.tsx
@@ -2,7 +2,7 @@
 import { AtUri } from "@atproto/syntax";
 import { PublicationSubscription } from "app/(home-pages)/reader/getSubscriptions";
 import { PubIcon } from "components/ActionBar/Publications";
-import { SubscribeButton } from "components/Subscribe/SubscribeButton";
+import { SubscribeInput } from "components/Subscribe/SubscribeButton";
 import { usePubTheme } from "components/ThemeManager/PublicationThemeProvider";
 import { BaseThemeProvider } from "components/ThemeManager/ThemeProvider";
 import { blobRefToSrc } from "src/utils/blobRefToSrc";
@@ -50,9 +50,9 @@ export const PubListing = (props: PubListingProps) => {
           backgroundSize: `${backgroundImageRepeat ? `${backgroundImageSize}px` : "cover"}`,
         }}
       >
-        <a href={record.url} className="absolute inset-0" />
+        <a href={record.url} className="absolute inset-0 z-[1]" />
         <div
-          className={`flex w-full flex-col justify-center text-center pt-4 pb-3 px-3 rounded-lg relative z-10  ${props.constrainHeight ? "sm:h-[200px] h-full" : "h-fit"} ${record.theme?.showPageBackground ? "bg-[rgba(var(--bg-page),var(--bg-page-alpha))] " : ""}`}
+          className={`flex w-full flex-col justify-center text-center pt-4 pb-3 px-3 rounded-lg relative   ${props.constrainHeight ? "sm:h-[200px] h-full" : "h-fit"} ${record.theme?.showPageBackground ? "bg-[rgba(var(--bg-page),var(--bg-page-alpha))] " : ""}`}
         >
           <div className="mx-auto pb-1">
             <PubIcon record={record} uri={props.uri} large />
@@ -84,9 +84,8 @@ export const PubListing = (props: PubListingProps) => {
             )}
           </div>
           {props.showSubscribeButton && (
-            <div className="mt-3 mx-auto">
-              <SubscribeButton
-                autoFocus
+            <div className="mt-3 max-w-sm mx-auto relative z-[2] w-full">
+              <SubscribeInput
                 publicationUri={props.uri}
                 publicationUrl={record.url}
                 publicationName={record.name}
diff --git a/app/about/AboutPage.tsx b/app/about/AboutPage.tsx
index 5637933e..c0ba854e 100644
--- a/app/about/AboutPage.tsx
+++ b/app/about/AboutPage.tsx
@@ -44,7 +44,7 @@ export function AboutPage() {
         A simple and powerful platform for social publishing <br />— blogs,
         newsletters, and more!
       </p>
-      <Demo />
+      {/*<Demo />*/}
       <Features />
       <Examples />
       <Pricing />
diff --git a/components/Subscribe/ManageSubscribe.tsx b/components/Subscribe/ManageSubscribe.tsx
index f76221c4..13ffd1cd 100644
--- a/components/Subscribe/ManageSubscribe.tsx
+++ b/components/Subscribe/ManageSubscribe.tsx
@@ -126,7 +126,7 @@ export const ManageSubscription = (props: {
   return (
     <Modal
       title={
-        <div className="text-secondary border-b border-border mb-2">
+        <div className="relative text-secondary border-b border-border mb-2">
           Manage Subscription
         </div>
       }
diff --git a/components/Subscribe/SubscribeButton.tsx b/components/Subscribe/SubscribeButton.tsx
index ceb6d46f..6712ce7e 100644
--- a/components/Subscribe/SubscribeButton.tsx
+++ b/components/Subscribe/SubscribeButton.tsx
@@ -52,35 +52,6 @@ export const SubscribePanel = (props: SubscribeProps) => {
   );
 };
 
-export const SubscribeButton = (props: SubscribeProps) => {
-  const user = useViewerSubscription(props.publicationUri);
-  const showManage = props.newsletterMode
-    ? user.emailSubscribed
-    : user.atprotoSubscribed;
-  return (
-    <Modal
-      className="px-0! py-3! sm:py-4! w-[1000px] sm:max-w-md max-w-full"
-      asChild
-      trigger={
-        showManage ? (
-          <ManageSubscription
-            publicationUri={props.publicationUri}
-            publicationUrl={props.publicationUrl}
-            newsletterMode={props.newsletterMode}
-            user={user}
-          />
-        ) : (
-          <ButtonPrimary compact className="text-sm">
-            Subscribe
-          </ButtonPrimary>
-        )
-      }
-    >
-      <SubscribePanel {...props} autoFocus />
-    </Modal>
-  );
-};
-
 export const SubscribeInput = (props: SubscribeProps) => {
   let toaster = useToaster();
   let router = useRouter();