diff --git a/web/src/app/login-admin/page.tsx b/web/src/app/login-admin/page.tsx
index 0c9ae674f..5837f2f7c 100644
--- a/web/src/app/login-admin/page.tsx
+++ b/web/src/app/login-admin/page.tsx
@@ -47,8 +47,8 @@ export default function AdminLoginPage() {
   };
 
   return (
-    <div style={styles.body}>
-      <div style={styles.container}>
+    <Section style={styles.body}>
+      <PageWrapper style={styles.container}>
         <Image
           src="https://raw.githubusercontent.com/SB2318/UltimateHealth/refs/heads/main/frontend/src/assets/images/adaptive-icon.png"
           style={styles.icon}
diff --git a/web/src/app/login/page.tsx b/web/src/app/login/page.tsx
index 5a710ffc9..a2ea549e2 100644
--- a/web/src/app/login/page.tsx
+++ b/web/src/app/login/page.tsx
@@ -47,8 +47,8 @@ export default function UserLoginPage() {
   };
 
   return (
-    <div style={styles.body}>
-      <div style={styles.container}>
+    <Section style={styles.body}>
+      <PageWrapper style={styles.container}>
         <Image
           src="https://raw.githubusercontent.com/SB2318/UltimateHealth/refs/heads/main/frontend/src/assets/images/adaptive-icon.png"
           style={styles.icon}
diff --git a/web/src/app/page.tsx b/web/src/app/page.tsx
index 704957087..449a9fb98 100644
--- a/web/src/app/page.tsx
+++ b/web/src/app/page.tsx
@@ -7,9 +7,12 @@ import "./globals.css";
 import { type RefObject, useCallback, useEffect, useRef, useState, useSyncExternalStore } from "react";
 import HeroAndDownload from "../components/HeroAndDownload";
 import ScrollToTop from "../components/ScrollToTop";
+
+import { PageWrapper, Section } from "../components/layout";
+
+import { withBasePath } from "@/lib/basePath";
 import { Skeleton } from "../components/ui";
-import PageWrapper from "../components/layout/PageWrapper";
-import Section from "../components/layout/Section";
+
 
 const userScreenshots = [
   { src: "/assets/article-home-screen.jpeg", caption: "Home Screen" },
@@ -507,8 +510,16 @@ export default function Home() {
         </nav>
       </header>
 
+ fix-unreachable-launching-soon-modal
+      {/* ── Hero ── */}
+      <HeroAndDownload
+        onJoinTestFlight={() => setAppleModal(true)}
+        onShowComingSoon={openComingSoonModal}
+      />
+
       {/* ── Hero + Downloads (new premium design) ── */}
       <HeroAndDownload onJoinTestFlight={() => setAppleModal(true)} />
+ web
       {/* ── Screenshots ── */}
       <Section id="screenshots">
         <PageWrapper>
diff --git a/web/src/components/HeroAndDownload.tsx b/web/src/components/HeroAndDownload.tsx
index 9cf3056f3..66446edc3 100644
--- a/web/src/components/HeroAndDownload.tsx
+++ b/web/src/components/HeroAndDownload.tsx
@@ -4,6 +4,7 @@ import Image from "next/image";
 
 type HeroAndDownloadProps = {
   onJoinTestFlight: () => void;
+  onShowComingSoon: () => void;
 };
 
 const activityItems = [
@@ -56,7 +57,7 @@ const platforms = [
   },
 ];
 
-export default function HeroAndDownload({ onJoinTestFlight }: HeroAndDownloadProps) {
+export default function HeroAndDownload({ onJoinTestFlight, onShowComingSoon }: HeroAndDownloadProps) {
   return (
     <>
       <section className="uh-hero">
@@ -244,7 +245,7 @@ export default function HeroAndDownload({ onJoinTestFlight }: HeroAndDownloadPro
                   </ul>
 
                   {platform.theme === "android" ? (
-                    <AndroidStoreButtons />
+                    <AndroidStoreButtons onShowComingSoon={onShowComingSoon} />
                   ) : (
                     <IosStoreButtons onJoinTestFlight={onJoinTestFlight} />
                   )}
@@ -322,7 +323,7 @@ function MiniPhone({ theme }: { theme: string }) {
   );
 }
 
-function AndroidStoreButtons() {
+function AndroidStoreButtons({ onShowComingSoon }: Pick<HeroAndDownloadProps, "onShowComingSoon">) {
   return (
     <div className="uh-store-buttons-group">
       <div className="uh-store-buttons">
@@ -352,12 +353,24 @@ function AndroidStoreButtons() {
             <strong>UHealth Admin</strong>
           </div>
         </a>
+        <button
+          type="button"
+          onClick={onShowComingSoon}
+          className="uh-store-btn uh-store-admin"
+          aria-label="View UHealth Admin closed testing launch status"
+        >
+          <i className="fas fa-hourglass-half" aria-hidden="true" />
+          <div>
+            <small>Launch Status</small>
+            <strong>Closed Testing</strong>
+          </div>
+        </button>
       </div>
     </div>
   );
 }
 
-function IosStoreButtons({ onJoinTestFlight }: HeroAndDownloadProps) {
+function IosStoreButtons({ onJoinTestFlight }: Pick<HeroAndDownloadProps, "onJoinTestFlight">) {
   return (
     <div className="uh-store-buttons-group">
       <div className="uh-store-buttons">
diff --git a/web/src/lib/basePath.ts b/web/src/lib/basePath.ts
index f4c21caa3..b5be84182 100644
--- a/web/src/lib/basePath.ts
+++ b/web/src/lib/basePath.ts
@@ -7,7 +7,7 @@ export const BASE_PATH = process.env.NEXT_PUBLIC_BASE_PATH || "";
 /**
  * Create a URL with the basePath prepended
  * Useful for internal navigation links
- * 
+ *
  * @param path - The path relative to the app root (e.g., "/contribute")
  * @returns The path with basePath prepended (e.g., "/frontend/v2/contribute")
  */
@@ -16,16 +16,16 @@ export function withBasePath(path: string): string {
   if (path.startsWith("http://") || path.startsWith("https://") || path.startsWith("mailto:") || path.startsWith("tel:")) {
     return path;
   }
-  
+
   // Don't modify hash-only links
   if (path.startsWith("#")) {
     return path;
   }
-  
+
   // Prepend basePath to internal paths
   if (BASE_PATH && !path.startsWith(BASE_PATH)) {
     return `${BASE_PATH}${path}`;
   }
-  
+
   return path;
 }