diff --git a/.github/ISSUE_TEMPLATE/content_update.yml b/.github/ISSUE_TEMPLATE/content_update.yml
index 6bf17adf..112265a1 100644
--- a/.github/ISSUE_TEMPLATE/content_update.yml
+++ b/.github/ISSUE_TEMPLATE/content_update.yml
@@ -22,7 +22,7 @@ body:
     attributes:
       label: "Affected pages or sections"
       description: "List routes, components, or assets that need updates."
-      placeholder: "Home hero copy, About bio, public/index.html gradient."
+      placeholder: "Home hero copy, About bio, public/fallback/index.html gradient."
     validations:
       required: true
   - type: textarea
diff --git a/.github/workflows/github-pages-preview.yml b/.github/workflows/github-pages-preview.yml
index 2491a5b6..18cdc6a6 100644
--- a/.github/workflows/github-pages-preview.yml
+++ b/.github/workflows/github-pages-preview.yml
@@ -10,6 +10,7 @@ permissions:
   contents: read
   pages: write
   id-token: write
+  pull-requests: write
 
 concurrency:
   group: pages-preview-${{ github.event.pull_request.number || github.ref }}
diff --git a/AGENTS.md b/AGENTS.md
index 6a611212..fc01092a 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -42,7 +42,7 @@
 - Privacy and legal copy should pull their “Last updated” value from `getBuildUpdatedAt()` so the date reflects the latest build automatically—never hardcode the date.
 - Developing skills use a dotted accent pill—follow the existing `isDeveloping` pattern in `SkillsSection` when adding new skills.
 - The contact form generates a `mailto:` draft; keep it client-only (no POST handlers) and preserve the copy-to-clipboard CTA.
-- The fallback page in `public/index.html` should mirror the warm accent palette; update gradients/buttons there when the brand colors change.
+- The fallback page in `public/fallback/index.html` should mirror the warm accent palette; update gradients/buttons there when the brand colors change.
 
 ## Testing Guidelines
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f7d56034..90d3a93d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ Below are suggestions and quick checks to help you convert this repo into your o
     - Important: this template includes a BSD-3-Clause `LICENSE` that must be preserved as-is in the source
       when redistributing or publishing derived works (see `LICENSE.example` for how to add your own copyright
       attribution without removing the original line).
-  - `public/index.html` and `src/data/*` — replace demo content with your personal content.
+  - `public/fallback/index.html` and `src/data/*` — replace demo content with your personal content.
 
 - If you plan to accept outside contributions on your fork, add a `CODE_OF_CONDUCT.md`, a `PULL_REQUEST_TEMPLATE.md`, and/or an `ISSUE_TEMPLATE/` directory so contributors have clear expectations.
 
diff --git a/LICENSE.example b/LICENSE.example
index 99bc1b88..974243fe 100644
--- a/LICENSE.example
+++ b/LICENSE.example
@@ -39,7 +39,7 @@ Choose the license that aligns with how you want others to use and contribute to
 
 - Fork the repo.
 - Update `LICENSE` (change copyright line and year).
-- Update `README.md` and `public/index.html` with your site name and contact info.
+- Update `README.md` and `public/fallback/index.html` with your site name and contact info.
 - Replace `src/data/*` content with your portfolio data.
 - Update `package.json` `name` and `license` fields.
 
diff --git a/package-lock.json b/package-lock.json
index 28dc8a0e..26d9407a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,7 @@
         "react-dom": "^19.2.0",
         "tailwind-merge": "^3.3.1",
         "tailwindcss": "^4.1.8",
-        "wrangler": "^4.16.0",
-        "zod": "^4.1.12"
+        "wrangler": "^4.16.0"
       },
       "devDependencies": {
         "@astrojs/check": "^0.9.9",
@@ -13507,6 +13506,7 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
       "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/package.json b/package.json
index 833c1792..91b9f173 100644
--- a/package.json
+++ b/package.json
@@ -33,8 +33,7 @@
     "react-dom": "^19.2.0",
     "tailwind-merge": "^3.3.1",
     "tailwindcss": "^4.1.8",
-    "wrangler": "^4.16.0",
-    "zod": "^4.1.12"
+    "wrangler": "^4.16.0"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.9",
diff --git a/public/index.html b/public/fallback/index.html
similarity index 98%
rename from public/index.html
rename to public/fallback/index.html
index 2f995dc1..1531a277 100644
--- a/public/index.html
+++ b/public/fallback/index.html
@@ -10,7 +10,7 @@
     <title>Something Went Wrong · Your Name</title>
     <meta
       name="description"
-      content="Fallback page for the template portfolio when the main application cannot load. Replace this content in public/index.html if desired."
+      content="Fallback page for the template portfolio when the main application cannot load. Replace this content in public/fallback/index.html if desired."
     />
     <style>
       @font-face {
diff --git a/src/hooks/useRemoteData.ts b/src/hooks/useRemoteData.ts
index a310e988..0d4b5b50 100644
--- a/src/hooks/useRemoteData.ts
+++ b/src/hooks/useRemoteData.ts
@@ -11,7 +11,7 @@ const DATA_BASE_URL = resolveRemoteDataBaseUrl(
   import.meta.env.VITE_REMOTE_DATA_URL as string | undefined,
 );
 const REMOTE_DATA_ENABLED = DATA_BASE_URL !== null;
-const REMOTE_DATA_PATH = "/__remote-data";
+const REMOTE_DATA_PATH = `${import.meta.env.BASE_URL}__remote-data`;
 
 // LocalStorage namespace for cached remote data. Rename if you fork the template
 // to avoid collisions with other apps in the browser.
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index 4f12770c..ac7630ee 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -10,6 +10,7 @@ const {
   title = "Portfolio Starter",
   description = "A modular portfolio starter built with Astro and React.",
 } = Astro.props as Props;
+const faviconHref = `${import.meta.env.BASE_URL}favicon.svg`;
 ---
 
 <!doctype html>
@@ -18,6 +19,7 @@ const {
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content={description} />
+    <link rel="icon" type="image/svg+xml" href={faviconHref} />
     <script is:inline>
       (() => {
         try {
diff --git a/src/utils/navigation.ts b/src/utils/navigation.ts
index 42951365..8c792d6b 100644
--- a/src/utils/navigation.ts
+++ b/src/utils/navigation.ts
@@ -7,7 +7,7 @@
 //
 // The build tool embeds the configured base path (set via BASE_PATH in this
 // template) into import.meta.env.BASE_URL, so we read it here to strip the prefix before
-// matching routes and re-apply it before calling history.pushState.
+// matching routes and re-apply it before calling window.location.assign.
 //
 // Template users: you do NOT need to change anything in this file.
 //   • Deploying to a root domain?  Leave BASE_PATH unset.  BASE_PATH will
@@ -55,8 +55,8 @@ function stripBasePath(pathname: string): string {
   return pathname;
 }
 
-/** Prepend the deployment base path to an app-relative path before pushing to
- *  browser history.  e.g. with BASE_PATH="/Portf":  "/privacy-policy" →
+/** Prepend the deployment base path to an app-relative path before assigning
+ *  browser location.  e.g. with BASE_PATH="/Portf":  "/privacy-policy" →
  *  "/Portf/privacy-policy".  Transparent no-op when no base path is set.
  */
 function addBasePath(path: string): string {
diff --git a/src/views/PrivacyPolicyPage.tsx b/src/views/PrivacyPolicyPage.tsx
index 82cd8bc5..93a4a28b 100644
--- a/src/views/PrivacyPolicyPage.tsx
+++ b/src/views/PrivacyPolicyPage.tsx
@@ -423,10 +423,9 @@ function PolicyIntro() {
     <p className={cn(paragraphClass, "mt-4")}>
       Your privacy matters. This Privacy Policy explains how the site owner
       (replace the name below) collects, uses, and safeguards personal
-      information when you visit the deployed site, interact with the contact
-      form, or engage with analytics services. <AdminHint>Your Name</AdminHint>,
-      interact with the contact form, or engage with the analytics services that
-      power the site.
+      information when you visit the deployed site. <AdminHint>Your Name</AdminHint>{" "}
+      may collect additional information when you interact with the contact form
+      or engage with the analytics services that power the site.
     </p>
   );
 }