diff --git a/app/(home-pages)/reader/layout.tsx b/app/(home-pages)/reader/layout.tsx
index 58d41c1c..4a9f08eb 100644
--- a/app/(home-pages)/reader/layout.tsx
+++ b/app/(home-pages)/reader/layout.tsx
@@ -1,7 +1,6 @@
 "use client";
 
-import { usePathname } from "next/navigation";
-import Link from "next/link";
+import { usePathname, useRouter } from "next/navigation";
 import { Header } from "components/PageHeader";
 import { Footer } from "components/ActionBar/Footer";
 import { DesktopNavigation } from "components/ActionBar/DesktopNavigation";
@@ -9,6 +8,7 @@ import { MobileNavigation } from "components/ActionBar/MobileNavigation";
 import { MediaContents } from "components/Media";
 import { DashboardIdContext } from "components/PageLayouts/DashboardLayout";
 import { useIdentityData } from "components/IdentityProvider";
+import { Tab } from "components/Tab";
 
 const allTabs = [
   { name: "Subs", href: "/reader", requiresAuth: true },
@@ -22,6 +22,7 @@ export default function ReaderLayout({
   children: React.ReactNode;
 }) {
   const pathname = usePathname();
+  const router = useRouter();
   const { identity } = useIdentityData();
   const isLoggedIn = !!identity?.atp_did;
   const tabs = allTabs.filter((tab) => !tab.requiresAuth || isLoggedIn);
@@ -52,17 +53,12 @@ export default function ReaderLayout({
           <Header>
             <div className="pubDashTabs flex flex-row gap-1">
               {tabs.map((tab) => (
-                <Link key={tab.name} href={tab.href}>
-                  <div
-                    className={`pubTabs px-1 py-0 flex gap-1 items-center rounded-md hover:cursor-pointer ${
-                      isActive(tab.href)
-                        ? "text-accent-2 bg-accent-1 font-bold -mb-px"
-                        : "text-secondary"
-                    }`}
-                  >
-                    {tab.name}
-                  </div>
-                </Link>
+                <Tab
+                  key={tab.name}
+                  name={tab.name}
+                  selected={isActive(tab.href)}
+                  onSelect={() => router.push(tab.href)}
+                />
               ))}
             </div>
             <div className="sm:block grow" />
diff --git a/app/lish/Subscribe.tsx b/app/lish/Subscribe.tsx
index 3e415a28..57768e7d 100644
--- a/app/lish/Subscribe.tsx
+++ b/app/lish/Subscribe.tsx
@@ -19,7 +19,7 @@ import {
 } from "./subscribeToPublication";
 import { DotLoader } from "components/utils/DotLoader";
 import { addFeed } from "./addFeed";
-import { useSearchParams } from "next/navigation";
+import { useSearchParams, usePathname } from "next/navigation";
 
 import { RSSSmall } from "components/Icons/RSSSmall";
 import { OAuthErrorMessage, isOAuthSessionError } from "components/OAuthError";
@@ -168,6 +168,7 @@ let BlueskySubscribeButton = (props: {
 }) => {
   let { identity } = useIdentityData();
   let toaster = useToaster();
+  let pathname = usePathname();
   let [oauthError, setOauthError] = useState<
     import("src/atproto-oauth").OAuthSessionError | null
   >(null);
@@ -195,6 +196,7 @@ let BlueskySubscribeButton = (props: {
   if (!identity?.atp_did) {
     return (
       <LoginModal
+        redirectRoute={pathname}
         trigger={<ButtonPrimary>Subscribe!</ButtonPrimary>}
         noEmailLogin
       />
@@ -206,7 +208,7 @@ let BlueskySubscribeButton = (props: {
         action={subscribe}
         className="place-self-center flex flex-row gap-1"
       >
-        <ButtonPrimary type="button" className="mx-auto max-w-full">
+        <ButtonPrimary type="submit" className="mx-auto max-w-full">
           {subscribePending ? (
             <DotLoader />
           ) : (