diff --git a/app/about/page.tsx b/app/about/page.tsx
index 4fbfc427..a9bd6b0a 100644
--- a/app/about/page.tsx
+++ b/app/about/page.tsx
@@ -61,7 +61,7 @@ export default function AboutPage() {
         </p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-10 space-y-14">
+      <main className="max-w-5xl mx-auto px-6 py-10 space-y-14">
         {/* ---- Mission ---- */}
         <section className="space-y-4">
           <h2 className="text-2xl font-bold text-foreground">Our Mission</h2>
diff --git a/app/books/bbd/[chapter]/page.tsx b/app/books/bbd/[chapter]/page.tsx
index cb2c764c..17dca253 100644
--- a/app/books/bbd/[chapter]/page.tsx
+++ b/app/books/bbd/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function BbdChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/bbd"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function BbdChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <BbdSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/bbd/page.tsx b/app/books/bbd/page.tsx
index 33a43c80..78bde8c4 100644
--- a/app/books/bbd/page.tsx
+++ b/app/books/bbd/page.tsx
@@ -27,7 +27,7 @@ export default async function BbdPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/bg/[chapter]/[verse]/page.tsx b/app/books/bg/[chapter]/[verse]/page.tsx
index d1b70e41..48d96290 100644
--- a/app/books/bg/[chapter]/[verse]/page.tsx
+++ b/app/books/bg/[chapter]/[verse]/page.tsx
@@ -60,7 +60,7 @@ export default async function VersePage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/bg"
           className="text-sm text-muted-foreground hover:text-foreground"
@@ -72,7 +72,7 @@ export default async function VersePage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-7xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         <ChapterViewer
           initialVerse={verse}
           initialVerseNum={requestedVerse}
diff --git a/app/books/bg/page.tsx b/app/books/bg/page.tsx
index 3936fbd0..33bdce81 100644
--- a/app/books/bg/page.tsx
+++ b/app/books/bg/page.tsx
@@ -37,7 +37,7 @@ export default async function BgPage() {
         </h1>
         <p className="mt-1 text-muted-foreground">{intro.author}</p>
       </PageHeader>
-      <main className="max-w-3xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <Card className="divide-y divide-border py-0">
           <CardContent className="p-0">
             <ul className="divide-y divide-border">
diff --git a/app/books/bk/[chapter]/page.tsx b/app/books/bk/[chapter]/page.tsx
index 43ce392c..1fdaa08b 100644
--- a/app/books/bk/[chapter]/page.tsx
+++ b/app/books/bk/[chapter]/page.tsx
@@ -41,7 +41,7 @@ export default async function BkChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/bk"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -56,7 +56,7 @@ export default async function BkChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <BkSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/bk/page.tsx b/app/books/bk/page.tsx
index 853d0eda..dc6eac44 100644
--- a/app/books/bk/page.tsx
+++ b/app/books/bk/page.tsx
@@ -25,7 +25,7 @@ export default async function BkPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/bs/[chapter]/[verse]/page.tsx b/app/books/bs/[chapter]/[verse]/page.tsx
index 9897664c..d1fa3873 100644
--- a/app/books/bs/[chapter]/[verse]/page.tsx
+++ b/app/books/bs/[chapter]/[verse]/page.tsx
@@ -151,7 +151,7 @@ export default async function VersePage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/bs"
           className="text-sm text-muted-foreground hover:text-foreground"
@@ -163,7 +163,7 @@ export default async function VersePage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-7xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         <ChapterViewer
           initialVerse={verse}
           initialVerseNum={requestedVerse}
diff --git a/app/books/bs/[chapter]/page.tsx b/app/books/bs/[chapter]/page.tsx
index 2b1d672e..148c8ba2 100644
--- a/app/books/bs/[chapter]/page.tsx
+++ b/app/books/bs/[chapter]/page.tsx
@@ -38,7 +38,7 @@ export default async function BsChapterPage({
 
     return (
       <div className="min-h-screen bg-background">
-        <PageHeader sticky wide>
+        <PageHeader sticky>
           <Link
             href="/books/bs"
             className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -50,7 +50,7 @@ export default async function BsChapterPage({
           </h1>
         </PageHeader>
 
-        <main className="max-w-3xl mx-auto px-6 py-8">
+        <main className="max-w-5xl mx-auto px-6 py-8">
           <Card>
             <CardContent className="py-8 px-6 sm:px-8">
               <div className="space-y-4">
diff --git a/app/books/bs/page.tsx b/app/books/bs/page.tsx
index dba08c7d..5686f0c2 100644
--- a/app/books/bs/page.tsx
+++ b/app/books/bs/page.tsx
@@ -92,7 +92,7 @@ export default async function BsPage() {
         )}
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Front Matter */}
         {(introduction || foreword) && (
           <div>
diff --git a/app/books/cbhc/[chapter]/page.tsx b/app/books/cbhc/[chapter]/page.tsx
index 1e194a11..b972a887 100644
--- a/app/books/cbhc/[chapter]/page.tsx
+++ b/app/books/cbhc/[chapter]/page.tsx
@@ -41,7 +41,7 @@ export default async function CbhcChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/cbhc"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -56,7 +56,7 @@ export default async function CbhcChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <CbhcSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/cbhc/page.tsx b/app/books/cbhc/page.tsx
index 98b1a27f..fb58282e 100644
--- a/app/books/cbhc/page.tsx
+++ b/app/books/cbhc/page.tsx
@@ -25,7 +25,7 @@ export default async function CbhcPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/cc/[lila]/[chapter]/[verse]/page.tsx b/app/books/cc/[lila]/[chapter]/[verse]/page.tsx
index d661eaf4..edd3035c 100644
--- a/app/books/cc/[lila]/[chapter]/[verse]/page.tsx
+++ b/app/books/cc/[lila]/[chapter]/[verse]/page.tsx
@@ -68,7 +68,7 @@ export default async function CcVersePage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href={`/books/cc/${lila}`}
           className="text-sm text-muted-foreground hover:text-foreground"
@@ -80,7 +80,7 @@ export default async function CcVersePage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-7xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         <ChapterViewer
           initialVerse={verseData}
           initialVerseNum={requestedVerse}
diff --git a/app/books/cc/[lila]/page.tsx b/app/books/cc/[lila]/page.tsx
index c733b90b..289a1fd3 100644
--- a/app/books/cc/[lila]/page.tsx
+++ b/app/books/cc/[lila]/page.tsx
@@ -54,7 +54,7 @@ export default async function LilaPage({
           <ExtractedVerseCount count={totalVerses} label="extracted verses" />
         </p>
       </PageHeader>
-      <main className="max-w-3xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <Card className="divide-y divide-border">
           <CardContent className="p-0">
             <ul className="divide-y divide-border">
diff --git a/app/books/cc/page.tsx b/app/books/cc/page.tsx
index a2ca019a..325cc8f7 100644
--- a/app/books/cc/page.tsx
+++ b/app/books/cc/page.tsx
@@ -45,7 +45,7 @@ export default async function CcPage() {
         <h1 className="mt-3 text-3xl font-bold text-foreground">{title}</h1>
         <p className="mt-1 text-muted-foreground">{author}</p>
       </PageHeader>
-      <main className="max-w-3xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <Card className="divide-y divide-border">
           <CardContent className="p-0">
             <ul className="divide-y divide-border">
diff --git a/app/books/ds/[chapter]/page.tsx b/app/books/ds/[chapter]/page.tsx
index 2d481cb4..f7548d5e 100644
--- a/app/books/ds/[chapter]/page.tsx
+++ b/app/books/ds/[chapter]/page.tsx
@@ -49,7 +49,7 @@ export default async function DsChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/ds"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -64,7 +64,7 @@ export default async function DsChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <DsSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/ds/page.tsx b/app/books/ds/page.tsx
index 8718d514..3e86f7da 100644
--- a/app/books/ds/page.tsx
+++ b/app/books/ds/page.tsx
@@ -30,7 +30,7 @@ export default async function DsPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/ej/[chapter]/page.tsx b/app/books/ej/[chapter]/page.tsx
index 4478e6ce..ea826491 100644
--- a/app/books/ej/[chapter]/page.tsx
+++ b/app/books/ej/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function EjChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/ej"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function EjChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <EjSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/ej/page.tsx b/app/books/ej/page.tsx
index 5580afe4..96771460 100644
--- a/app/books/ej/page.tsx
+++ b/app/books/ej/page.tsx
@@ -30,7 +30,7 @@ export default async function EjPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/ek/[chapter]/page.tsx b/app/books/ek/[chapter]/page.tsx
index b2e17404..2e36787d 100644
--- a/app/books/ek/[chapter]/page.tsx
+++ b/app/books/ek/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function EkChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/ek"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function EkChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <EkSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/ek/page.tsx b/app/books/ek/page.tsx
index 3c091901..0f660948 100644
--- a/app/books/ek/page.tsx
+++ b/app/books/ek/page.tsx
@@ -27,7 +27,7 @@ export default async function EkPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/gg/[chapter]/page.tsx b/app/books/gg/[chapter]/page.tsx
index 322cbf43..369a7cc2 100644
--- a/app/books/gg/[chapter]/page.tsx
+++ b/app/books/gg/[chapter]/page.tsx
@@ -45,7 +45,7 @@ export default async function GgChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/gg"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -60,7 +60,7 @@ export default async function GgChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <GgSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/gg/page.tsx b/app/books/gg/page.tsx
index 4989bbe7..849ec4c2 100644
--- a/app/books/gg/page.tsx
+++ b/app/books/gg/page.tsx
@@ -31,7 +31,7 @@ export default async function GgPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/hkh/[chapter]/page.tsx b/app/books/hkh/[chapter]/page.tsx
index c426c367..933f4130 100644
--- a/app/books/hkh/[chapter]/page.tsx
+++ b/app/books/hkh/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function HkhChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/hkh"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function HkhChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <HkhSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/hkh/page.tsx b/app/books/hkh/page.tsx
index c5ddcefa..41e51b5a 100644
--- a/app/books/hkh/page.tsx
+++ b/app/books/hkh/page.tsx
@@ -27,7 +27,7 @@ export default async function HkhPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/iso/[mantra]/page.tsx b/app/books/iso/[mantra]/page.tsx
index d3bdd2f1..a601fcc6 100644
--- a/app/books/iso/[mantra]/page.tsx
+++ b/app/books/iso/[mantra]/page.tsx
@@ -55,7 +55,7 @@ export default async function IsoMantraPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/iso"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -73,7 +73,7 @@ export default async function IsoMantraPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <IsoSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/iso/page.tsx b/app/books/iso/page.tsx
index 8402af8e..97ffc277 100644
--- a/app/books/iso/page.tsx
+++ b/app/books/iso/page.tsx
@@ -35,7 +35,7 @@ export default async function IsoPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/kb/[volume]/[slug]/page.tsx b/app/books/kb/[volume]/[slug]/page.tsx
index 48157db6..7fd7a47a 100644
--- a/app/books/kb/[volume]/[slug]/page.tsx
+++ b/app/books/kb/[volume]/[slug]/page.tsx
@@ -35,7 +35,7 @@ export default async function KbChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href={`/books/kb/${vol}`}
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -50,7 +50,7 @@ export default async function KbChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar — chapter index */}
         <ChapterSidebar
           chapters={allChapters}
diff --git a/app/books/kb/[volume]/page.tsx b/app/books/kb/[volume]/page.tsx
index 68d46d00..bffb43fe 100644
--- a/app/books/kb/[volume]/page.tsx
+++ b/app/books/kb/[volume]/page.tsx
@@ -37,7 +37,7 @@ export default async function KbVolumePage({
         </h1>
         <p className="mt-1 text-muted-foreground">{chapters.length} chapters</p>
       </PageHeader>
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Front Matter */}
         {introSegments.length > 0 && (
           <div>
diff --git a/app/books/kb/page.tsx b/app/books/kb/page.tsx
index 274c95d0..2b1def29 100644
--- a/app/books/kb/page.tsx
+++ b/app/books/kb/page.tsx
@@ -31,7 +31,7 @@ export default async function KbPage() {
         <h1 className="mt-3 text-3xl font-bold text-foreground">{title}</h1>
         <p className="mt-1 text-muted-foreground">{author}</p>
       </PageHeader>
-      <main className="max-w-3xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         {description && (
           <p className="text-muted-foreground mb-6">{description}</p>
         )}
diff --git a/app/books/lcl/[chapter]/page.tsx b/app/books/lcl/[chapter]/page.tsx
index 9b90f31d..05c6bb2b 100644
--- a/app/books/lcl/[chapter]/page.tsx
+++ b/app/books/lcl/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function LclChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/lcl"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function LclChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <LclSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/lcl/page.tsx b/app/books/lcl/page.tsx
index d5b87c8b..a0f1fc09 100644
--- a/app/books/lcl/page.tsx
+++ b/app/books/lcl/page.tsx
@@ -31,7 +31,7 @@ export default async function LclPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/lob/[chapter]/page.tsx b/app/books/lob/[chapter]/page.tsx
index c5eb9543..ea6e5d62 100644
--- a/app/books/lob/[chapter]/page.tsx
+++ b/app/books/lob/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function LobChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/lob"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function LobChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <LobSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/lob/page.tsx b/app/books/lob/page.tsx
index 52629775..1e311d9b 100644
--- a/app/books/lob/page.tsx
+++ b/app/books/lob/page.tsx
@@ -27,7 +27,7 @@ export default async function LobPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/mg/[chapter]/page.tsx b/app/books/mg/[chapter]/page.tsx
index f0cf1c08..4e7ca4ab 100644
--- a/app/books/mg/[chapter]/page.tsx
+++ b/app/books/mg/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function MgChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/mg"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function MgChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <MgSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/mg/page.tsx b/app/books/mg/page.tsx
index 6e7b0760..1a1a57cc 100644
--- a/app/books/mg/page.tsx
+++ b/app/books/mg/page.tsx
@@ -27,7 +27,7 @@ export default async function MgPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/mm/[chapter]/[verse]/page.tsx b/app/books/mm/[chapter]/[verse]/page.tsx
index c404ef64..6a938eea 100644
--- a/app/books/mm/[chapter]/[verse]/page.tsx
+++ b/app/books/mm/[chapter]/[verse]/page.tsx
@@ -151,7 +151,7 @@ export default async function VersePage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/mm"
           className="text-sm text-muted-foreground hover:text-foreground"
@@ -163,7 +163,7 @@ export default async function VersePage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-7xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         <ChapterViewer
           initialVerse={verse}
           initialVerseNum={requestedVerse}
diff --git a/app/books/mm/[chapter]/page.tsx b/app/books/mm/[chapter]/page.tsx
index d61bd14a..4cb73cce 100644
--- a/app/books/mm/[chapter]/page.tsx
+++ b/app/books/mm/[chapter]/page.tsx
@@ -38,7 +38,7 @@ export default async function MmChapterPage({
 
     return (
       <div className="min-h-screen bg-background">
-        <PageHeader sticky wide>
+        <PageHeader sticky>
           <Link
             href="/books/mm"
             className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -50,7 +50,7 @@ export default async function MmChapterPage({
           </h1>
         </PageHeader>
 
-        <main className="max-w-3xl mx-auto px-6 py-8">
+        <main className="max-w-5xl mx-auto px-6 py-8">
           <Card>
             <CardContent className="py-8 px-6 sm:px-8">
               <div className="space-y-4">
diff --git a/app/books/mm/page.tsx b/app/books/mm/page.tsx
index f09c3d40..73681422 100644
--- a/app/books/mm/page.tsx
+++ b/app/books/mm/page.tsx
@@ -91,7 +91,7 @@ export default async function MmPage() {
         )}
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Front Matter */}
         {introduction && (
           <div>
diff --git a/app/books/mog/[chapter]/page.tsx b/app/books/mog/[chapter]/page.tsx
index 0d15baa7..dc45b946 100644
--- a/app/books/mog/[chapter]/page.tsx
+++ b/app/books/mog/[chapter]/page.tsx
@@ -45,7 +45,7 @@ export default async function MogChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/mog"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -60,7 +60,7 @@ export default async function MogChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <MogSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/mog/page.tsx b/app/books/mog/page.tsx
index 11611c97..58155c03 100644
--- a/app/books/mog/page.tsx
+++ b/app/books/mog/page.tsx
@@ -27,7 +27,7 @@ export default async function MogPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/nbs/[chapter]/[verse]/page.tsx b/app/books/nbs/[chapter]/[verse]/page.tsx
index a7665f5d..46b904c9 100644
--- a/app/books/nbs/[chapter]/[verse]/page.tsx
+++ b/app/books/nbs/[chapter]/[verse]/page.tsx
@@ -151,7 +151,7 @@ export default async function VersePage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/nbs"
           className="text-sm text-muted-foreground hover:text-foreground"
@@ -163,7 +163,7 @@ export default async function VersePage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-7xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         <ChapterViewer
           initialVerse={verse}
           initialVerseNum={requestedVerse}
diff --git a/app/books/nbs/[chapter]/page.tsx b/app/books/nbs/[chapter]/page.tsx
index 2a0dcfe4..eecd61db 100644
--- a/app/books/nbs/[chapter]/page.tsx
+++ b/app/books/nbs/[chapter]/page.tsx
@@ -38,7 +38,7 @@ export default async function NbsChapterPage({
 
     return (
       <div className="min-h-screen bg-background">
-        <PageHeader sticky wide>
+        <PageHeader sticky>
           <Link
             href="/books/nbs"
             className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -50,7 +50,7 @@ export default async function NbsChapterPage({
           </h1>
         </PageHeader>
 
-        <main className="max-w-3xl mx-auto px-6 py-8">
+        <main className="max-w-5xl mx-auto px-6 py-8">
           <Card>
             <CardContent className="py-8 px-6 sm:px-8">
               <div className="space-y-4">
diff --git a/app/books/nbs/page.tsx b/app/books/nbs/page.tsx
index 11b21d61..80852c65 100644
--- a/app/books/nbs/page.tsx
+++ b/app/books/nbs/page.tsx
@@ -91,7 +91,7 @@ export default async function NbsPage() {
         )}
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Front Matter */}
         {introduction && (
           <div>
diff --git a/app/books/nod/[chapter]/page.tsx b/app/books/nod/[chapter]/page.tsx
index b7220e3a..fb50b00d 100644
--- a/app/books/nod/[chapter]/page.tsx
+++ b/app/books/nod/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function NodChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/nod"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function NodChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <NodSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/nod/page.tsx b/app/books/nod/page.tsx
index 14ac7e83..22cf7bd0 100644
--- a/app/books/nod/page.tsx
+++ b/app/books/nod/page.tsx
@@ -37,7 +37,7 @@ export default async function NodPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/noi/[text]/page.tsx b/app/books/noi/[text]/page.tsx
index d360b6a4..a3c85df7 100644
--- a/app/books/noi/[text]/page.tsx
+++ b/app/books/noi/[text]/page.tsx
@@ -55,7 +55,7 @@ export default async function NoiTextPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/noi"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -73,7 +73,7 @@ export default async function NoiTextPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <NoiSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/noi/page.tsx b/app/books/noi/page.tsx
index 743eb503..c387af29 100644
--- a/app/books/noi/page.tsx
+++ b/app/books/noi/page.tsx
@@ -32,7 +32,7 @@ export default async function NoiPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/ochkm/[chapter]/page.tsx b/app/books/ochkm/[chapter]/page.tsx
index ef9c62e2..6894268d 100644
--- a/app/books/ochkm/[chapter]/page.tsx
+++ b/app/books/ochkm/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function OchkmChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/ochkm"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function OchkmChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <OchkmSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/ochkm/page.tsx b/app/books/ochkm/page.tsx
index bd4b351f..e8bec0bb 100644
--- a/app/books/ochkm/page.tsx
+++ b/app/books/ochkm/page.tsx
@@ -27,7 +27,7 @@ export default async function OchkmPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/owk/[chapter]/page.tsx b/app/books/owk/[chapter]/page.tsx
index ebeb4d6e..47fec633 100644
--- a/app/books/owk/[chapter]/page.tsx
+++ b/app/books/owk/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function OwkChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/owk"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function OwkChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <OwkSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/owk/page.tsx b/app/books/owk/page.tsx
index dddef7bf..d34bb7e1 100644
--- a/app/books/owk/page.tsx
+++ b/app/books/owk/page.tsx
@@ -27,7 +27,7 @@ export default async function OwkPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/page.tsx b/app/books/page.tsx
index 4982705d..84059dcf 100644
--- a/app/books/page.tsx
+++ b/app/books/page.tsx
@@ -155,7 +155,7 @@ export default async function BooksPage() {
         </p>
       </PageHeader>
 
-      <main className="max-w-6xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <BooksGrid books={books} />
       </main>
     </div>
diff --git a/app/books/pk/[chapter]/page.tsx b/app/books/pk/[chapter]/page.tsx
index cefed86e..52389f70 100644
--- a/app/books/pk/[chapter]/page.tsx
+++ b/app/books/pk/[chapter]/page.tsx
@@ -40,7 +40,7 @@ export default async function PkChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/pk"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -55,7 +55,7 @@ export default async function PkChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <PkSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/pk/page.tsx b/app/books/pk/page.tsx
index 8753b8eb..45eb1804 100644
--- a/app/books/pk/page.tsx
+++ b/app/books/pk/page.tsx
@@ -25,7 +25,7 @@ export default async function PkPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/poy/[chapter]/page.tsx b/app/books/poy/[chapter]/page.tsx
index e508780d..93a75713 100644
--- a/app/books/poy/[chapter]/page.tsx
+++ b/app/books/poy/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function PoyChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/poy"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function PoyChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <PoySidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/poy/page.tsx b/app/books/poy/page.tsx
index 8edcfa4b..94c51dd7 100644
--- a/app/books/poy/page.tsx
+++ b/app/books/poy/page.tsx
@@ -27,7 +27,7 @@ export default async function PoyPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/pqpa/[chapter]/page.tsx b/app/books/pqpa/[chapter]/page.tsx
index 6cfa3193..f7da9ae9 100644
--- a/app/books/pqpa/[chapter]/page.tsx
+++ b/app/books/pqpa/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function PqpaChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/pqpa"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function PqpaChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <PqpaSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/pqpa/page.tsx b/app/books/pqpa/page.tsx
index 79b05ea5..a486fa87 100644
--- a/app/books/pqpa/page.tsx
+++ b/app/books/pqpa/page.tsx
@@ -31,7 +31,7 @@ export default async function PqpaPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/rv/[chapter]/page.tsx b/app/books/rv/[chapter]/page.tsx
index 14a9b588..4a3ae792 100644
--- a/app/books/rv/[chapter]/page.tsx
+++ b/app/books/rv/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function RvChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/rv"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function RvChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <RvSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/rv/page.tsx b/app/books/rv/page.tsx
index 62f9e06e..c56afc44 100644
--- a/app/books/rv/page.tsx
+++ b/app/books/rv/page.tsx
@@ -27,7 +27,7 @@ export default async function RvPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/sb/[canto]/[chapter]/[verse]/page.tsx b/app/books/sb/[canto]/[chapter]/[verse]/page.tsx
index 2f78e51e..e779ac35 100644
--- a/app/books/sb/[canto]/[chapter]/[verse]/page.tsx
+++ b/app/books/sb/[canto]/[chapter]/[verse]/page.tsx
@@ -65,7 +65,7 @@ export default async function SbVersePage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href={`/books/sb/${canto}`}
           className="text-sm text-muted-foreground hover:text-foreground"
@@ -77,7 +77,7 @@ export default async function SbVersePage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-7xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         <ChapterViewer
           initialVerse={verseData}
           initialVerseNum={requestedVerse}
diff --git a/app/books/sb/[canto]/page.tsx b/app/books/sb/[canto]/page.tsx
index 9d77c4d0..0da3b6de 100644
--- a/app/books/sb/[canto]/page.tsx
+++ b/app/books/sb/[canto]/page.tsx
@@ -54,7 +54,7 @@ export default async function CantoPage({
           <ExtractedVerseCount count={totalVerses} label="extracted verses" />
         </p>
       </PageHeader>
-      <main className="max-w-3xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <Card className="divide-y divide-border">
           <CardContent className="p-0">
             <ul className="divide-y divide-border">
diff --git a/app/books/sb/page.tsx b/app/books/sb/page.tsx
index 23a3993c..1903a814 100644
--- a/app/books/sb/page.tsx
+++ b/app/books/sb/page.tsx
@@ -45,7 +45,7 @@ export default async function SbPage() {
         </h1>
         <p className="mt-1 text-muted-foreground">{intro.author}</p>
       </PageHeader>
-      <main className="max-w-3xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <Card className="divide-y divide-border">
           <CardContent className="p-0">
             <ul className="divide-y divide-border">
diff --git a/app/books/sb1962/[chapter]/[verse]/page.tsx b/app/books/sb1962/[chapter]/[verse]/page.tsx
index 25f09cda..119bd6cc 100644
--- a/app/books/sb1962/[chapter]/[verse]/page.tsx
+++ b/app/books/sb1962/[chapter]/[verse]/page.tsx
@@ -63,7 +63,7 @@ export default async function VersePage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/sb1962"
           className="text-sm text-muted-foreground hover:text-foreground"
@@ -75,7 +75,7 @@ export default async function VersePage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-7xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         <ChapterViewer
           initialVerse={verse}
           initialVerseNum={requestedVerse}
diff --git a/app/books/sb1962/page.tsx b/app/books/sb1962/page.tsx
index aab21a44..a0d95421 100644
--- a/app/books/sb1962/page.tsx
+++ b/app/books/sb1962/page.tsx
@@ -38,7 +38,7 @@ export default async function Sb1962Page() {
         </h1>
         <p className="mt-1 text-muted-foreground">{intro.author}</p>
       </PageHeader>
-      <main className="max-w-3xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <Card className="divide-y divide-border py-0">
           <CardContent className="p-0">
             <ul className="divide-y divide-border">
diff --git a/app/books/ssr/[chapter]/page.tsx b/app/books/ssr/[chapter]/page.tsx
index f77edfc5..c2e44d23 100644
--- a/app/books/ssr/[chapter]/page.tsx
+++ b/app/books/ssr/[chapter]/page.tsx
@@ -49,7 +49,7 @@ export default async function SsrChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/ssr"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -64,7 +64,7 @@ export default async function SsrChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <SsrSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/ssr/page.tsx b/app/books/ssr/page.tsx
index 26cc799e..f6797d22 100644
--- a/app/books/ssr/page.tsx
+++ b/app/books/ssr/page.tsx
@@ -31,7 +31,7 @@ export default async function SsrPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/sva/[chapter]/page.tsx b/app/books/sva/[chapter]/page.tsx
index 3f07f49b..85564698 100644
--- a/app/books/sva/[chapter]/page.tsx
+++ b/app/books/sva/[chapter]/page.tsx
@@ -50,7 +50,7 @@ export default async function SvaChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/sva"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -65,7 +65,7 @@ export default async function SvaChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <SvaSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/sva/page.tsx b/app/books/sva/page.tsx
index cb4bcc2a..75f491d9 100644
--- a/app/books/sva/page.tsx
+++ b/app/books/sva/page.tsx
@@ -31,7 +31,7 @@ export default async function SvaPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/tlc/[chapter]/page.tsx b/app/books/tlc/[chapter]/page.tsx
index 18cf9239..1cf0a7de 100644
--- a/app/books/tlc/[chapter]/page.tsx
+++ b/app/books/tlc/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function TlcChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/tlc"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function TlcChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <TlcSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/tlc/page.tsx b/app/books/tlc/page.tsx
index 0f9b45f7..740318a9 100644
--- a/app/books/tlc/page.tsx
+++ b/app/books/tlc/page.tsx
@@ -35,7 +35,7 @@ export default async function TlcPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/tlk/[chapter]/page.tsx b/app/books/tlk/[chapter]/page.tsx
index 110f7de5..106debf3 100644
--- a/app/books/tlk/[chapter]/page.tsx
+++ b/app/books/tlk/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function TlkChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/tlk"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function TlkChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <TlkSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/tlk/page.tsx b/app/books/tlk/page.tsx
index 6cc10265..c8bcb2bb 100644
--- a/app/books/tlk/page.tsx
+++ b/app/books/tlk/page.tsx
@@ -31,7 +31,7 @@ export default async function TlkPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/tqk/[chapter]/page.tsx b/app/books/tqk/[chapter]/page.tsx
index e1d08e06..793e43ef 100644
--- a/app/books/tqk/[chapter]/page.tsx
+++ b/app/books/tqk/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function TqkChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/tqk"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function TqkChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <TqkSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/tqk/page.tsx b/app/books/tqk/page.tsx
index c4f5d34d..4fade4ab 100644
--- a/app/books/tqk/page.tsx
+++ b/app/books/tqk/page.tsx
@@ -31,7 +31,7 @@ export default async function TqkPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/ttp/[chapter]/page.tsx b/app/books/ttp/[chapter]/page.tsx
index 4c2a710d..de4a3af5 100644
--- a/app/books/ttp/[chapter]/page.tsx
+++ b/app/books/ttp/[chapter]/page.tsx
@@ -43,7 +43,7 @@ export default async function TtpChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/ttp"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function TtpChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <TtpSidebar items={sidebarItems} currentSlug={slug} />
 
diff --git a/app/books/ttp/page.tsx b/app/books/ttp/page.tsx
index 71c7a3a8..b07e6c47 100644
--- a/app/books/ttp/page.tsx
+++ b/app/books/ttp/page.tsx
@@ -25,7 +25,7 @@ export default async function TtpPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/books/va/[chapter]/page.tsx b/app/books/va/[chapter]/page.tsx
index 32f5806e..1b5c5a14 100644
--- a/app/books/va/[chapter]/page.tsx
+++ b/app/books/va/[chapter]/page.tsx
@@ -36,7 +36,7 @@ export default async function VaChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/books/va"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -48,7 +48,7 @@ export default async function VaChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         <VaSidebar items={sidebarItems} currentSlug={slug} />
 
         <main className="flex-1 min-w-0 px-6 py-8 space-y-8">
diff --git a/app/books/va/page.tsx b/app/books/va/page.tsx
index c4caec70..c6667fea 100644
--- a/app/books/va/page.tsx
+++ b/app/books/va/page.tsx
@@ -25,7 +25,7 @@ export default async function VaPage() {
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
         )}
diff --git a/app/disciples/page.tsx b/app/disciples/page.tsx
index 9ef9912f..0c25f81c 100644
--- a/app/disciples/page.tsx
+++ b/app/disciples/page.tsx
@@ -88,7 +88,7 @@ export default async function DisciplesPage({
         </p>
       </PageHeader>
 
-      <main className="max-w-6xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <DisciplesBrowser
           initialDisciples={serializedDisciples}
           initialLetter={activeLetter}
diff --git a/app/essays/[slug]/page.tsx b/app/essays/[slug]/page.tsx
index b37593b4..d5ad845b 100644
--- a/app/essays/[slug]/page.tsx
+++ b/app/essays/[slug]/page.tsx
@@ -109,7 +109,7 @@ export default async function EssayPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href="/essays"
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -121,7 +121,7 @@ export default async function EssayPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <EssaySidebar items={allEssays} currentSlug={slug} />
 
diff --git a/app/essays/page.tsx b/app/essays/page.tsx
index 4e6eaf40..1fd99f5b 100644
--- a/app/essays/page.tsx
+++ b/app/essays/page.tsx
@@ -38,7 +38,7 @@ export default async function EssaysPage() {
         </p>
       </PageHeader>
 
-      <main className="max-w-6xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <EssaysGrid essays={items} />
       </main>
     </div>
diff --git a/app/glossary/page.tsx b/app/glossary/page.tsx
index 1bea9f32..4651943a 100644
--- a/app/glossary/page.tsx
+++ b/app/glossary/page.tsx
@@ -42,7 +42,7 @@ export default async function GlossaryPage() {
         <p className="mt-1 text-muted-foreground">{data.description}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <GlossaryClient data={data} />
       </main>
     </div>
diff --git a/app/journals/[slug]/[chapter]/page.tsx b/app/journals/[slug]/[chapter]/page.tsx
index dfe6cf9b..9cb4ab60 100644
--- a/app/journals/[slug]/[chapter]/page.tsx
+++ b/app/journals/[slug]/[chapter]/page.tsx
@@ -41,7 +41,7 @@ export default async function JournalChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href={`/journals/${slug}`}
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -53,7 +53,7 @@ export default async function JournalChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         <ChapterSidebar
           items={sidebarItems}
           currentSlug={chapterSlug}
diff --git a/app/journals/[slug]/page.tsx b/app/journals/[slug]/page.tsx
index 3d224761..aed2e1ee 100644
--- a/app/journals/[slug]/page.tsx
+++ b/app/journals/[slug]/page.tsx
@@ -35,7 +35,7 @@ export default async function JournalIndexPage({
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
         )}
diff --git a/app/journals/page.tsx b/app/journals/page.tsx
index cf00a129..751e1a26 100644
--- a/app/journals/page.tsx
+++ b/app/journals/page.tsx
@@ -21,7 +21,7 @@ export default async function JournalsPage() {
         </p>
       </PageHeader>
 
-      <main className="max-w-6xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
           {journals.map((journal) => (
             <Link key={journal.book} href={`/journals/${bookCodeToSlug(journal.book)}`} className="block h-full">
diff --git a/app/letters/[slug]/page.tsx b/app/letters/[slug]/page.tsx
index 3b55b82b..5f3b55bb 100644
--- a/app/letters/[slug]/page.tsx
+++ b/app/letters/[slug]/page.tsx
@@ -42,7 +42,7 @@ export default async function LetterPage({
         </p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Top nav */}
         <LetterNav prev={prev} next={next} />
 
diff --git a/app/letters/filter-year-browser.tsx b/app/letters/filter-year-browser.tsx
new file mode 100644
index 00000000..7f701a86
--- /dev/null
+++ b/app/letters/filter-year-browser.tsx
@@ -0,0 +1,536 @@
+"use client";
+
+import { useState, useMemo, useRef, useEffect } from "react";
+import Link from "next/link";
+import { Card, CardContent } from "@/components/ui/card";
+import { buttonVariants } from "@/components/ui/button";
+import { ReadingSettings } from "@/components/reading-settings";
+import { cn } from "@/lib/utils";
+import { ChevronLeft, ChevronRight, Menu } from "lucide-react";
+import {
+  Drawer,
+  DrawerClose,
+  DrawerContent,
+  DrawerHeader,
+  DrawerTitle,
+  DrawerTrigger,
+} from "@/components/ui/drawer";
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+export type LetterItem = {
+  slug: string;
+  recipientDisplay: string;
+  date: string | null;
+  year: number | null;
+  month: number | null;
+  location: string | null;
+};
+
+type YearGroup = {
+  year: number;
+  label: string;
+  count: number;
+  letters: LetterItem[];
+};
+
+type MonthGroup = {
+  month: number;
+  label: string;
+  letters: LetterItem[];
+};
+
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+const MONTH_NAMES = [
+  "",
+  "January",
+  "February",
+  "March",
+  "April",
+  "May",
+  "June",
+  "July",
+  "August",
+  "September",
+  "October",
+  "November",
+  "December",
+];
+
+// ---------------------------------------------------------------------------
+// Grouping helpers
+// ---------------------------------------------------------------------------
+
+function buildYearGroups(letters: LetterItem[]): YearGroup[] {
+  const map = new Map<number, LetterItem[]>();
+
+  for (const letter of letters) {
+    const y = letter.year ?? 0;
+    if (!map.has(y)) map.set(y, []);
+    map.get(y)!.push(letter);
+  }
+
+  const groups: YearGroup[] = [];
+
+  // Sorted years first, then undated (0) at the end
+  const years = Array.from(map.keys()).sort((a, b) => a - b);
+  for (const y of years) {
+    if (y === 0) continue;
+    const items = map.get(y)!;
+    groups.push({
+      year: y,
+      label: String(y),
+      count: items.length,
+      letters: items,
+    });
+  }
+  const undated = map.get(0);
+  if (undated && undated.length > 0) {
+    groups.push({
+      year: 0,
+      label: "Undated",
+      count: undated.length,
+      letters: undated,
+    });
+  }
+
+  return groups;
+}
+
+function buildMonthGroups(letters: LetterItem[]): MonthGroup[] {
+  const map = new Map<number, LetterItem[]>();
+
+  for (const letter of letters) {
+    const m =
+      letter.month && letter.month >= 1 && letter.month <= 12
+        ? letter.month
+        : 0;
+    if (!map.has(m)) map.set(m, []);
+    map.get(m)!.push(letter);
+  }
+
+  const groups: MonthGroup[] = [];
+  for (let m = 1; m <= 12; m++) {
+    const items = map.get(m);
+    if (items && items.length > 0) {
+      groups.push({ month: m, label: MONTH_NAMES[m], letters: items });
+    }
+  }
+  const unknown = map.get(0);
+  if (unknown && unknown.length > 0) {
+    groups.push({ month: 0, label: "Unknown Month", letters: unknown });
+  }
+
+  return groups;
+}
+
+// ---------------------------------------------------------------------------
+// Year Sidebar — matches book chapter sidebar
+// ---------------------------------------------------------------------------
+
+function YearSidebar({
+  groups,
+  activeYear,
+  onSelect,
+}: {
+  groups: YearGroup[];
+  activeYear: number;
+  onSelect: (year: number) => void;
+}) {
+  return (
+    <aside className="hidden lg:block w-56 shrink-0 sticky top-[89px] self-start max-h-[calc(100vh-89px)] overflow-y-auto py-8 pr-4">
+      <h2 className="text-xs font-bold uppercase tracking-wider text-muted-foreground mb-3 px-2">
+        Years
+      </h2>
+      <nav className="flex flex-col gap-0.5">
+        {groups.map((g) => {
+          const isActive = g.year === activeYear;
+          return (
+            <button
+              key={g.year}
+              onClick={() => onSelect(g.year)}
+              className={cn(
+                "flex items-center justify-between gap-2 px-2 py-1.5 rounded-md text-sm transition-colors text-left",
+                isActive
+                  ? "bg-primary/10 text-primary font-medium"
+                  : "text-muted-foreground hover:bg-muted hover:text-foreground",
+              )}
+            >
+              <span className="truncate">{g.label}</span>
+              <span
+                className={cn(
+                  "text-xs tabular-nums shrink-0",
+                  isActive ? "text-primary/70" : "text-muted-foreground/60",
+                )}
+              >
+                {g.count}
+              </span>
+            </button>
+          );
+        })}
+      </nav>
+    </aside>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Mobile drawer — matches MobileNav
+// ---------------------------------------------------------------------------
+
+function YearMobileNav({
+  groups,
+  activeYear,
+  onSelect,
+  title,
+}: {
+  groups: YearGroup[];
+  activeYear: number;
+  onSelect: (year: number) => void;
+  title: string;
+}) {
+  const [open, setOpen] = useState(false);
+
+  return (
+    <Drawer open={open} onOpenChange={setOpen} direction="left">
+      <DrawerTrigger
+        className={cn(
+          buttonVariants({ variant: "outline", size: "sm" }),
+          "lg:hidden gap-1.5",
+        )}
+      >
+        <Menu className="size-4" />
+        <span className="hidden sm:inline">Years</span>
+      </DrawerTrigger>
+      <DrawerContent direction="left" className="h-full">
+        <DrawerHeader className="text-left border-b border-border pb-4 mb-2">
+          <DrawerTitle>{title}</DrawerTitle>
+        </DrawerHeader>
+        <nav className="overflow-y-auto px-4 pb-6 pt-2">
+          <div className="flex flex-col gap-0.5">
+            {groups.map((g) => {
+              const isActive = g.year === activeYear;
+              return (
+                <DrawerClose key={g.year} asChild>
+                  <button
+                    onClick={() => {
+                      onSelect(g.year);
+                      setOpen(false);
+                    }}
+                    className={cn(
+                      "flex items-center justify-between gap-2 px-2 py-2 rounded-md text-sm transition-colors text-left",
+                      isActive
+                        ? "bg-primary/10 text-primary font-medium"
+                        : "text-muted-foreground hover:bg-muted hover:text-foreground",
+                    )}
+                  >
+                    <span>{g.label}</span>
+                    <span
+                      className={cn(
+                        "text-xs tabular-nums",
+                        isActive
+                          ? "text-primary/70"
+                          : "text-muted-foreground/60",
+                      )}
+                    >
+                      {g.count}
+                    </span>
+                  </button>
+                </DrawerClose>
+              );
+            })}
+          </div>
+        </nav>
+      </DrawerContent>
+    </Drawer>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Prev / Next nav — matches BbdNav
+// ---------------------------------------------------------------------------
+
+function YearNav({
+  prev,
+  next,
+  groups,
+  activeYear,
+  onSelect,
+  drawerTitle,
+}: {
+  prev: YearGroup | null;
+  next: YearGroup | null;
+  groups: YearGroup[];
+  activeYear: number;
+  onSelect: (year: number) => void;
+  drawerTitle: string;
+}) {
+  return (
+    <div className="flex items-center justify-between gap-3">
+      <div className="flex items-center gap-2">
+        <YearMobileNav
+          groups={groups}
+          activeYear={activeYear}
+          onSelect={onSelect}
+          title={drawerTitle}
+        />
+
+        {prev ? (
+          <button
+            onClick={() => onSelect(prev.year)}
+            className={cn(
+              buttonVariants({ variant: "outline", size: "sm" }),
+              "gap-1.5",
+            )}
+          >
+            <ChevronLeft className="size-4" />
+            <span className="hidden sm:inline truncate max-w-[180px]">
+              {prev.label}
+            </span>
+            <span className="sm:hidden">Previous</span>
+          </button>
+        ) : (
+          <div className="hidden lg:block" />
+        )}
+      </div>
+
+      {next ? (
+        <button
+          onClick={() => onSelect(next.year)}
+          className={cn(
+            buttonVariants({ variant: "outline", size: "sm" }),
+            "gap-1.5",
+          )}
+        >
+          <span className="hidden sm:inline truncate max-w-[180px]">
+            {next.label}
+          </span>
+          <span className="sm:hidden">Next</span>
+          <ChevronRight className="size-4" />
+        </button>
+      ) : (
+        <div />
+      )}
+    </div>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Month section — collapsible group of letters for a single month
+// ---------------------------------------------------------------------------
+
+function MonthSection({
+  group,
+  defaultOpen,
+}: {
+  group: MonthGroup;
+  defaultOpen: boolean;
+}) {
+  const [open, setOpen] = useState(defaultOpen);
+
+  return (
+    <div>
+      <button
+        onClick={() => setOpen(!open)}
+        className="flex items-center gap-3 w-full px-5 py-3 text-left hover:bg-muted/50 transition-colors"
+      >
+        <ChevronRight
+          className={cn(
+            "size-4 text-muted-foreground shrink-0 transition-transform",
+            open && "rotate-90",
+          )}
+        />
+        <span className="font-semibold text-foreground text-sm">
+          {group.label}
+        </span>
+        <span className="text-xs text-muted-foreground tabular-nums">
+          {group.letters.length}{" "}
+          {group.letters.length === 1 ? "letter" : "letters"}
+        </span>
+      </button>
+
+      {open && (
+        <ul className="divide-y divide-border">
+          {group.letters.map((letter) => (
+            <li key={letter.slug}>
+              <Link
+                href={`/letters/${letter.slug}`}
+                className="flex flex-col sm:flex-row sm:items-center sm:justify-between px-5 pl-12 py-3.5 gap-1 sm:gap-4 hover:bg-muted transition-colors"
+              >
+                <div className="min-w-0 flex-1">
+                  <p className="font-medium text-foreground text-sm">
+                    To: {letter.recipientDisplay}
+                  </p>
+                  <p className="text-xs text-muted-foreground mt-0.5">
+                    {letter.date || "Undated"}
+                    {letter.location ? ` · ${letter.location}` : ""}
+                  </p>
+                </div>
+              </Link>
+            </li>
+          ))}
+        </ul>
+      )}
+    </div>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Main component — header + sidebar (years) + content (month-grouped letters)
+//
+// Props:
+//   letters     — all letters for this filter (recipient or location)
+//   filterName  — display name for the filter ("Mukunda", "New York", etc.)
+//   filterType  — "recipient" | "location" (used for back link and title)
+//   totalCount  — total letter count
+// ---------------------------------------------------------------------------
+
+export function FilterYearBrowser({
+  letters,
+  filterName,
+  filterType,
+  totalCount,
+}: {
+  letters: LetterItem[];
+  filterName: string;
+  filterType: "recipient" | "location";
+  totalCount: number;
+}) {
+  const yearGroups = useMemo(() => buildYearGroups(letters), [letters]);
+
+  const [activeYear, setActiveYear] = useState<number>(
+    yearGroups.length > 0 ? yearGroups[0].year : 0,
+  );
+
+  const contentRef = useRef<HTMLDivElement>(null);
+
+  // Keep active year valid
+  useEffect(() => {
+    if (
+      yearGroups.length > 0 &&
+      !yearGroups.find((g) => g.year === activeYear)
+    ) {
+      setActiveYear(yearGroups[0].year);
+    }
+  }, [yearGroups, activeYear]);
+
+  const handleYearSelect = (year: number) => {
+    setActiveYear(year);
+    contentRef.current?.scrollIntoView({ behavior: "smooth", block: "start" });
+  };
+
+  // Active group + neighbors
+  const activeIdx = yearGroups.findIndex((g) => g.year === activeYear);
+  const activeGroup = activeIdx >= 0 ? yearGroups[activeIdx] : null;
+  const prev = activeIdx > 0 ? yearGroups[activeIdx - 1] : null;
+  const next =
+    activeIdx >= 0 && activeIdx < yearGroups.length - 1
+      ? yearGroups[activeIdx + 1]
+      : null;
+
+  // Month groups within the active year
+  const monthGroups = useMemo(
+    () => buildMonthGroups(activeGroup?.letters ?? []),
+    [activeGroup],
+  );
+
+  // Header text
+  const backHref =
+    filterType === "recipient"
+      ? "/letters?view=recipient"
+      : "/letters?view=location";
+  const backLabel =
+    filterType === "recipient" ? "Letters by Recipient" : "Letters by Location";
+  const titlePrefix =
+    filterType === "recipient" ? "Letters to" : "Letters from";
+  const drawerTitle = `${titlePrefix} ${filterName}`;
+  const activeYearLabel = activeGroup?.label ?? "Unknown";
+
+  return (
+    <>
+      {/* Header */}
+      <header className="border-b border-border bg-card px-6 py-4 sticky top-0 z-20">
+        <div className="max-w-5xl mx-auto flex items-start justify-between gap-4">
+          <div className="flex-1 min-w-0">
+            <Link
+              href={backHref}
+              className="text-sm text-muted-foreground hover:text-foreground transition-colors"
+            >
+              &larr; {backLabel}
+            </Link>
+            <h1 className="mt-3 text-2xl font-bold text-foreground">
+              <span className="text-primary">
+                {titlePrefix} {filterName}:{" "}
+              </span>
+              {activeYearLabel}
+            </h1>
+            <p className="mt-1 text-muted-foreground">
+              {activeGroup?.count ?? 0}{" "}
+              {(activeGroup?.count ?? 0) === 1 ? "letter" : "letters"} in{" "}
+              {activeYearLabel} · {totalCount} total
+            </p>
+          </div>
+          <div className="shrink-0 pt-1">
+            <ReadingSettings />
+          </div>
+        </div>
+      </header>
+
+      {/* Sidebar + Main */}
+      <div className="max-w-5xl mx-auto flex">
+        {/* Left sidebar — years */}
+        <YearSidebar
+          groups={yearGroups}
+          activeYear={activeYear}
+          onSelect={handleYearSelect}
+        />
+
+        {/* Main content */}
+        <main ref={contentRef} className="flex-1 min-w-0 px-6 py-8 space-y-8">
+          {/* Top navigation */}
+          <YearNav
+            prev={prev}
+            next={next}
+            groups={yearGroups}
+            activeYear={activeYear}
+            onSelect={handleYearSelect}
+            drawerTitle={drawerTitle}
+          />
+
+          {/* Content — letters grouped by month */}
+          {monthGroups.length === 0 ? (
+            <div className="py-12 text-center text-muted-foreground">
+              <p className="text-lg font-medium">No letters for this year</p>
+            </div>
+          ) : (
+            <Card className="overflow-hidden">
+              <CardContent className="p-0 divide-y divide-border">
+                {monthGroups.map((mg, i) => (
+                  <MonthSection
+                    key={mg.month}
+                    group={mg}
+                    defaultOpen={i === 0 || monthGroups.length <= 3}
+                  />
+                ))}
+              </CardContent>
+            </Card>
+          )}
+
+          {/* Bottom navigation */}
+          <YearNav
+            prev={prev}
+            next={next}
+            groups={yearGroups}
+            activeYear={activeYear}
+            onSelect={handleYearSelect}
+            drawerTitle={drawerTitle}
+          />
+        </main>
+      </div>
+    </>
+  );
+}
diff --git a/app/letters/location/[name]/page.tsx b/app/letters/location/[name]/page.tsx
index ca8baede..3c049344 100644
--- a/app/letters/location/[name]/page.tsx
+++ b/app/letters/location/[name]/page.tsx
@@ -1,10 +1,8 @@
 export const dynamic = "force-dynamic";
 
-import Link from "next/link";
 import { notFound } from "next/navigation";
 import { getLettersByLocation } from "@/lib/letters";
-import { PageHeader } from "@/components/page-header";
-import { Card, CardContent } from "@/components/ui/card";
+import { FilterYearBrowser } from "../../filter-year-browser";
 
 export default async function LettersByLocationPage({
   params,
@@ -17,48 +15,23 @@ export default async function LettersByLocationPage({
   const letters = await getLettersByLocation(name);
   if (letters.length === 0) notFound();
 
+  const serialized = letters.map((l) => ({
+    slug: l.slug,
+    recipientDisplay: l.recipientDisplay,
+    date: l.date,
+    year: l.year,
+    month: l.month,
+    location: l.location,
+  }));
+
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader>
-        <Link
-          href="/letters?view=location"
-          className="text-sm text-muted-foreground hover:text-foreground transition-colors"
-        >
-          &larr; Letters by Location
-        </Link>
-        <h1 className="mt-3 text-3xl font-bold text-foreground">
-          Letters from {name}
-        </h1>
-        <p className="mt-1 text-muted-foreground">
-          {letters.length} {letters.length === 1 ? "letter" : "letters"}
-        </p>
-      </PageHeader>
-
-      <main className="max-w-3xl mx-auto px-6 py-8">
-        <Card className="divide-y divide-border">
-          <CardContent className="p-0">
-            <ul className="divide-y divide-border">
-              {letters.map((letter) => (
-                <li key={letter.slug}>
-                  <Link
-                    href={`/letters/${letter.slug}`}
-                    className="flex flex-col sm:flex-row sm:items-center sm:justify-between px-5 py-4 gap-1 sm:gap-4 hover:bg-muted transition-colors"
-                  >
-                    <div className="min-w-0">
-                      <p className="font-medium text-foreground">
-                        To: {letter.recipientDisplay}
-                      </p>
-                      <p className="text-sm text-muted-foreground">
-                        {letter.date || "Undated"}
-                      </p>
-                    </div>
-                  </Link>
-                </li>
-              ))}
-            </ul>
-          </CardContent>
-        </Card>
-      </main>
+      <FilterYearBrowser
+        letters={serialized}
+        filterName={name}
+        filterType="location"
+        totalCount={letters.length}
+      />
     </div>
   );
 }
diff --git a/app/letters/recipient/[name]/page.tsx b/app/letters/recipient/[name]/page.tsx
index a95cc89c..5d9ffb5d 100644
--- a/app/letters/recipient/[name]/page.tsx
+++ b/app/letters/recipient/[name]/page.tsx
@@ -1,10 +1,8 @@
 export const dynamic = "force-dynamic";
 
-import Link from "next/link";
 import { notFound } from "next/navigation";
 import { getLettersByRecipient } from "@/lib/letters";
-import { PageHeader } from "@/components/page-header";
-import { Card, CardContent } from "@/components/ui/card";
+import { FilterYearBrowser } from "../../filter-year-browser";
 
 export default async function LettersByRecipientPage({
   params,
@@ -17,49 +15,23 @@ export default async function LettersByRecipientPage({
   const letters = await getLettersByRecipient(name);
   if (letters.length === 0) notFound();
 
+  const serialized = letters.map((l) => ({
+    slug: l.slug,
+    recipientDisplay: l.recipientDisplay,
+    date: l.date,
+    year: l.year,
+    month: l.month,
+    location: l.location,
+  }));
+
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader>
-        <Link
-          href="/letters?view=recipient"
-          className="text-sm text-muted-foreground hover:text-foreground transition-colors"
-        >
-          &larr; Letters by Recipient
-        </Link>
-        <h1 className="mt-3 text-3xl font-bold text-foreground">
-          Letters to or including {name}
-        </h1>
-        <p className="mt-1 text-muted-foreground">
-          {letters.length} {letters.length === 1 ? "letter" : "letters"}
-        </p>
-      </PageHeader>
-
-      <main className="max-w-3xl mx-auto px-6 py-8">
-        <Card className="divide-y divide-border">
-          <CardContent className="p-0">
-            <ul className="divide-y divide-border">
-              {letters.map((letter) => (
-                <li key={letter.slug}>
-                  <Link
-                    href={`/letters/${letter.slug}`}
-                    className="flex flex-col sm:flex-row sm:items-center sm:justify-between px-5 py-4 gap-1 sm:gap-4 hover:bg-muted transition-colors"
-                  >
-                    <div className="min-w-0">
-                      <p className="font-medium text-foreground">
-                        To: {letter.recipientDisplay}
-                      </p>
-                      <p className="text-sm text-muted-foreground">
-                        {letter.date || "Undated"}
-                        {letter.location ? ` · ${letter.location}` : ""}
-                      </p>
-                    </div>
-                  </Link>
-                </li>
-              ))}
-            </ul>
-          </CardContent>
-        </Card>
-      </main>
+      <FilterYearBrowser
+        letters={serialized}
+        filterName={name}
+        filterType="recipient"
+        totalCount={letters.length}
+      />
     </div>
   );
 }
diff --git a/app/letters/year/[year]/page.tsx b/app/letters/year/[year]/page.tsx
index 40af1aaf..b4b5b4c1 100644
--- a/app/letters/year/[year]/page.tsx
+++ b/app/letters/year/[year]/page.tsx
@@ -1,10 +1,8 @@
 export const dynamic = "force-dynamic";
 
-import Link from "next/link";
 import { notFound } from "next/navigation";
 import { getLettersByYear } from "@/lib/letters";
-import { PageHeader } from "@/components/page-header";
-import { Card, CardContent } from "@/components/ui/card";
+import { YearMonthBrowser } from "./year-month-browser";
 
 export default async function LettersByYearPage({
   params,
@@ -18,49 +16,22 @@ export default async function LettersByYearPage({
   const letters = await getLettersByYear(year);
   if (letters.length === 0) notFound();
 
+  const serialized = letters.map((l) => ({
+    slug: l.slug,
+    recipientDisplay: l.recipientDisplay,
+    date: l.date,
+    year: l.year,
+    month: l.month,
+    location: l.location,
+  }));
+
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader>
-        <Link
-          href="/letters?view=year"
-          className="text-sm text-muted-foreground hover:text-foreground transition-colors"
-        >
-          &larr; Letters by Year
-        </Link>
-        <h1 className="mt-3 text-3xl font-bold text-foreground">
-          Letters from {year}
-        </h1>
-        <p className="mt-1 text-muted-foreground">
-          {letters.length} {letters.length === 1 ? "letter" : "letters"}
-        </p>
-      </PageHeader>
-
-      <main className="max-w-3xl mx-auto px-6 py-8">
-        <Card className="divide-y divide-border">
-          <CardContent className="p-0">
-            <ul className="divide-y divide-border">
-              {letters.map((letter) => (
-                <li key={letter.slug}>
-                  <Link
-                    href={`/letters/${letter.slug}`}
-                    className="flex flex-col sm:flex-row sm:items-center sm:justify-between px-5 py-4 gap-1 sm:gap-4 hover:bg-muted transition-colors"
-                  >
-                    <div className="min-w-0">
-                      <p className="font-medium text-foreground">
-                        To: {letter.recipientDisplay}
-                      </p>
-                      <p className="text-sm text-muted-foreground">
-                        {letter.date}
-                        {letter.location ? ` · ${letter.location}` : ""}
-                      </p>
-                    </div>
-                  </Link>
-                </li>
-              ))}
-            </ul>
-          </CardContent>
-        </Card>
-      </main>
+      <YearMonthBrowser
+        letters={serialized}
+        year={year}
+        totalCount={letters.length}
+      />
     </div>
   );
 }
diff --git a/app/letters/year/[year]/year-month-browser.tsx b/app/letters/year/[year]/year-month-browser.tsx
new file mode 100644
index 00000000..cd245e72
--- /dev/null
+++ b/app/letters/year/[year]/year-month-browser.tsx
@@ -0,0 +1,451 @@
+"use client";
+
+import { useState, useMemo, useRef, useEffect } from "react";
+import Link from "next/link";
+import { Card, CardContent } from "@/components/ui/card";
+import { buttonVariants } from "@/components/ui/button";
+import { ReadingSettings } from "@/components/reading-settings";
+import { cn } from "@/lib/utils";
+import { ChevronLeft, ChevronRight, Menu } from "lucide-react";
+import {
+  Drawer,
+  DrawerClose,
+  DrawerContent,
+  DrawerHeader,
+  DrawerTitle,
+  DrawerTrigger,
+} from "@/components/ui/drawer";
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+export type LetterItem = {
+  slug: string;
+  recipientDisplay: string;
+  date: string | null;
+  year: number | null;
+  month: number | null;
+  location: string | null;
+};
+
+type MonthGroup = {
+  month: number;
+  label: string;
+  shortLabel: string;
+  count: number;
+  letters: LetterItem[];
+};
+
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+const MONTH_NAMES = [
+  "",
+  "January",
+  "February",
+  "March",
+  "April",
+  "May",
+  "June",
+  "July",
+  "August",
+  "September",
+  "October",
+  "November",
+  "December",
+];
+
+const MONTH_SHORT = [
+  "",
+  "Jan",
+  "Feb",
+  "Mar",
+  "Apr",
+  "May",
+  "Jun",
+  "Jul",
+  "Aug",
+  "Sep",
+  "Oct",
+  "Nov",
+  "Dec",
+];
+
+// ---------------------------------------------------------------------------
+// Build month groups from flat letter list
+// ---------------------------------------------------------------------------
+
+function buildMonthGroups(letters: LetterItem[]): MonthGroup[] {
+  const map = new Map<number, LetterItem[]>();
+
+  for (const letter of letters) {
+    const m =
+      letter.month && letter.month >= 1 && letter.month <= 12
+        ? letter.month
+        : 0;
+    if (!map.has(m)) map.set(m, []);
+    map.get(m)!.push(letter);
+  }
+
+  const groups: MonthGroup[] = [];
+  for (let m = 1; m <= 12; m++) {
+    const items = map.get(m);
+    if (items && items.length > 0) {
+      groups.push({
+        month: m,
+        label: MONTH_NAMES[m],
+        shortLabel: MONTH_SHORT[m],
+        count: items.length,
+        letters: items,
+      });
+    }
+  }
+  const unknown = map.get(0);
+  if (unknown && unknown.length > 0) {
+    groups.push({
+      month: 0,
+      label: "Unknown Month",
+      shortLabel: "Unknown",
+      count: unknown.length,
+      letters: unknown,
+    });
+  }
+
+  return groups;
+}
+
+// ---------------------------------------------------------------------------
+// Sidebar — matches book chapter sidebar
+// ---------------------------------------------------------------------------
+
+function MonthSidebar({
+  groups,
+  activeMonth,
+  onSelect,
+}: {
+  groups: MonthGroup[];
+  activeMonth: number;
+  onSelect: (month: number) => void;
+}) {
+  return (
+    <aside className="hidden lg:block w-56 shrink-0 sticky top-[89px] self-start max-h-[calc(100vh-89px)] overflow-y-auto py-8 pr-4">
+      <h2 className="text-xs font-bold uppercase tracking-wider text-muted-foreground mb-3 px-2">
+        Months
+      </h2>
+      <nav className="flex flex-col gap-0.5">
+        {groups.map((g) => {
+          const isActive = g.month === activeMonth;
+          return (
+            <button
+              key={g.month}
+              onClick={() => onSelect(g.month)}
+              className={cn(
+                "flex items-center justify-between gap-2 px-2 py-1.5 rounded-md text-sm transition-colors text-left",
+                isActive
+                  ? "bg-primary/10 text-primary font-medium"
+                  : "text-muted-foreground hover:bg-muted hover:text-foreground",
+              )}
+            >
+              <span className="truncate">{g.label}</span>
+              <span
+                className={cn(
+                  "text-xs tabular-nums shrink-0",
+                  isActive ? "text-primary/70" : "text-muted-foreground/60",
+                )}
+              >
+                {g.count}
+              </span>
+            </button>
+          );
+        })}
+      </nav>
+    </aside>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Mobile drawer — matches MobileNav
+// ---------------------------------------------------------------------------
+
+function MonthMobileNav({
+  groups,
+  activeMonth,
+  onSelect,
+  year,
+}: {
+  groups: MonthGroup[];
+  activeMonth: number;
+  onSelect: (month: number) => void;
+  year: number;
+}) {
+  const [open, setOpen] = useState(false);
+
+  return (
+    <Drawer open={open} onOpenChange={setOpen} direction="left">
+      <DrawerTrigger
+        className={cn(
+          buttonVariants({ variant: "outline", size: "sm" }),
+          "lg:hidden gap-1.5",
+        )}
+      >
+        <Menu className="size-4" />
+        <span className="hidden sm:inline">Months</span>
+      </DrawerTrigger>
+      <DrawerContent direction="left" className="h-full">
+        <DrawerHeader className="text-left border-b border-border pb-4 mb-2">
+          <DrawerTitle>Letters from {year}</DrawerTitle>
+        </DrawerHeader>
+        <nav className="overflow-y-auto px-4 pb-6 pt-2">
+          <div className="flex flex-col gap-0.5">
+            {groups.map((g) => {
+              const isActive = g.month === activeMonth;
+              return (
+                <DrawerClose key={g.month} asChild>
+                  <button
+                    onClick={() => {
+                      onSelect(g.month);
+                      setOpen(false);
+                    }}
+                    className={cn(
+                      "flex items-center justify-between gap-2 px-2 py-2 rounded-md text-sm transition-colors text-left",
+                      isActive
+                        ? "bg-primary/10 text-primary font-medium"
+                        : "text-muted-foreground hover:bg-muted hover:text-foreground",
+                    )}
+                  >
+                    <span>{g.label}</span>
+                    <span
+                      className={cn(
+                        "text-xs tabular-nums",
+                        isActive
+                          ? "text-primary/70"
+                          : "text-muted-foreground/60",
+                      )}
+                    >
+                      {g.count}
+                    </span>
+                  </button>
+                </DrawerClose>
+              );
+            })}
+          </div>
+        </nav>
+      </DrawerContent>
+    </Drawer>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Prev / Next nav — matches BbdNav
+// ---------------------------------------------------------------------------
+
+function MonthNav({
+  prev,
+  next,
+  groups,
+  activeMonth,
+  onSelect,
+  year,
+}: {
+  prev: MonthGroup | null;
+  next: MonthGroup | null;
+  groups: MonthGroup[];
+  activeMonth: number;
+  onSelect: (month: number) => void;
+  year: number;
+}) {
+  return (
+    <div className="flex items-center justify-between gap-3">
+      <div className="flex items-center gap-2">
+        <MonthMobileNav
+          groups={groups}
+          activeMonth={activeMonth}
+          onSelect={onSelect}
+          year={year}
+        />
+
+        {prev ? (
+          <button
+            onClick={() => onSelect(prev.month)}
+            className={cn(
+              buttonVariants({ variant: "outline", size: "sm" }),
+              "gap-1.5",
+            )}
+          >
+            <ChevronLeft className="size-4" />
+            <span className="hidden sm:inline truncate max-w-[180px]">
+              {prev.shortLabel}
+            </span>
+            <span className="sm:hidden">Previous</span>
+          </button>
+        ) : (
+          <div className="hidden lg:block" />
+        )}
+      </div>
+
+      {next ? (
+        <button
+          onClick={() => onSelect(next.month)}
+          className={cn(
+            buttonVariants({ variant: "outline", size: "sm" }),
+            "gap-1.5",
+          )}
+        >
+          <span className="hidden sm:inline truncate max-w-[180px]">
+            {next.shortLabel}
+          </span>
+          <span className="sm:hidden">Next</span>
+          <ChevronRight className="size-4" />
+        </button>
+      ) : (
+        <div />
+      )}
+    </div>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Main component — renders header + sidebar + content (entire page layout)
+// ---------------------------------------------------------------------------
+
+export function YearMonthBrowser({
+  letters,
+  year,
+  totalCount,
+}: {
+  letters: LetterItem[];
+  year: number;
+  totalCount: number;
+}) {
+  const allGroups = useMemo(() => buildMonthGroups(letters), [letters]);
+
+  const [activeMonth, setActiveMonth] = useState<number>(
+    allGroups.length > 0 ? allGroups[0].month : 1,
+  );
+
+  const contentRef = useRef<HTMLDivElement>(null);
+
+  // Keep active month valid
+  useEffect(() => {
+    if (
+      allGroups.length > 0 &&
+      !allGroups.find((g) => g.month === activeMonth)
+    ) {
+      setActiveMonth(allGroups[0].month);
+    }
+  }, [allGroups, activeMonth]);
+
+  const handleMonthSelect = (month: number) => {
+    setActiveMonth(month);
+    contentRef.current?.scrollIntoView({ behavior: "smooth", block: "start" });
+  };
+
+  // Active group + neighbors
+  const activeIdx = allGroups.findIndex((g) => g.month === activeMonth);
+  const activeGroup = activeIdx >= 0 ? allGroups[activeIdx] : null;
+  const prev = activeIdx > 0 ? allGroups[activeIdx - 1] : null;
+  const next =
+    activeIdx >= 0 && activeIdx < allGroups.length - 1
+      ? allGroups[activeIdx + 1]
+      : null;
+
+  const activeLetters = activeGroup?.letters ?? [];
+  const activeLabel = activeGroup?.label ?? "Unknown Month";
+
+  return (
+    <>
+      {/* Header */}
+      <header className="border-b border-border bg-card px-6 py-4 sticky top-0 z-20">
+        <div className="max-w-5xl mx-auto flex items-start justify-between gap-4">
+          <div className="flex-1 min-w-0">
+            <Link
+              href="/letters?view=year"
+              className="text-sm text-muted-foreground hover:text-foreground transition-colors"
+            >
+              &larr; Letters by Year
+            </Link>
+            <h1 className="mt-3 text-2xl font-bold text-foreground">
+              <span className="text-primary">Letters: </span>
+              {activeLabel} {year}
+            </h1>
+            <p className="mt-1 text-muted-foreground">
+              {activeGroup?.count ?? 0}{" "}
+              {(activeGroup?.count ?? 0) === 1 ? "letter" : "letters"} ·{" "}
+              {totalCount} total in {year}
+            </p>
+          </div>
+          <div className="shrink-0 pt-1">
+            <ReadingSettings />
+          </div>
+        </div>
+      </header>
+
+      {/* Sidebar + Main */}
+      <div className="max-w-5xl mx-auto flex">
+        {/* Left sidebar */}
+        <MonthSidebar
+          groups={allGroups}
+          activeMonth={activeMonth}
+          onSelect={handleMonthSelect}
+        />
+
+        {/* Main content */}
+        <main ref={contentRef} className="flex-1 min-w-0 px-6 py-8 space-y-8">
+          {/* Top navigation */}
+          <MonthNav
+            prev={prev}
+            next={next}
+            groups={allGroups}
+            activeMonth={activeMonth}
+            onSelect={handleMonthSelect}
+            year={year}
+          />
+
+          {/* Content */}
+          {activeLetters.length === 0 ? (
+            <div className="py-12 text-center text-muted-foreground">
+              <p className="text-lg font-medium">No letters for this month</p>
+            </div>
+          ) : (
+            <Card>
+              <CardContent className="p-0">
+                <ul className="divide-y divide-border">
+                  {activeLetters.map((letter) => (
+                    <li key={letter.slug}>
+                      <Link
+                        href={`/letters/${letter.slug}`}
+                        className="flex flex-col sm:flex-row sm:items-center sm:justify-between px-5 py-4 gap-1 sm:gap-4 hover:bg-muted transition-colors"
+                      >
+                        <div className="min-w-0">
+                          <p className="font-medium text-foreground">
+                            To: {letter.recipientDisplay}
+                          </p>
+                          <p className="text-sm text-muted-foreground">
+                            {letter.date || "Undated"}
+                            {letter.location ? ` · ${letter.location}` : ""}
+                          </p>
+                        </div>
+                      </Link>
+                    </li>
+                  ))}
+                </ul>
+              </CardContent>
+            </Card>
+          )}
+
+          {/* Bottom navigation */}
+          <MonthNav
+            prev={prev}
+            next={next}
+            groups={allGroups}
+            activeMonth={activeMonth}
+            onSelect={handleMonthSelect}
+            year={year}
+          />
+        </main>
+      </div>
+    </>
+  );
+}
diff --git a/app/magazines/[slug]/[issue]/page.tsx b/app/magazines/[slug]/[issue]/page.tsx
index bbc36385..a4d3fcea 100644
--- a/app/magazines/[slug]/[issue]/page.tsx
+++ b/app/magazines/[slug]/[issue]/page.tsx
@@ -40,7 +40,7 @@ export default async function MagazineIssuePage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href={`/magazines/${slug}`}
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -52,7 +52,7 @@ export default async function MagazineIssuePage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         <IssueSidebar
           items={sidebarItems}
           currentSlug={issueSlug}
diff --git a/app/magazines/[slug]/page.tsx b/app/magazines/[slug]/page.tsx
index 43017a21..828487ac 100644
--- a/app/magazines/[slug]/page.tsx
+++ b/app/magazines/[slug]/page.tsx
@@ -35,7 +35,7 @@ export default async function MagazineIndexPage({
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
         )}
diff --git a/app/magazines/page.tsx b/app/magazines/page.tsx
index 60d9f85e..8b02f726 100644
--- a/app/magazines/page.tsx
+++ b/app/magazines/page.tsx
@@ -52,7 +52,7 @@ export default async function MagazinesPage() {
         </p>
       </PageHeader>
 
-      <main className="max-w-6xl mx-auto px-6 py-8 space-y-10">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-10">
         {sortedGroups.map((group) => (
           <div key={group}>
             {showGroupHeadings && (
diff --git a/app/other-documents/[slug]/[chapter]/page.tsx b/app/other-documents/[slug]/[chapter]/page.tsx
index 35d11ec1..95d66103 100644
--- a/app/other-documents/[slug]/[chapter]/page.tsx
+++ b/app/other-documents/[slug]/[chapter]/page.tsx
@@ -45,7 +45,7 @@ export default async function OtherDocumentChapterPage({
 
   return (
     <div className="min-h-screen bg-background">
-      <PageHeader sticky wide>
+      <PageHeader sticky>
         <Link
           href={`/other-documents/${slug}`}
           className="text-sm text-muted-foreground hover:text-foreground transition-colors"
@@ -58,7 +58,7 @@ export default async function OtherDocumentChapterPage({
         </h1>
       </PageHeader>
 
-      <div className="w-full md:max-w-6xl mx-auto flex">
+      <div className="max-w-5xl mx-auto flex">
         {/* Left sidebar */}
         <ChapterSidebar
           items={sidebarItems}
diff --git a/app/other-documents/[slug]/page.tsx b/app/other-documents/[slug]/page.tsx
index 64e9c437..931bffe0 100644
--- a/app/other-documents/[slug]/page.tsx
+++ b/app/other-documents/[slug]/page.tsx
@@ -32,7 +32,7 @@ export default async function OtherDocumentIndexPage({
         <p className="mt-1 text-muted-foreground">{meta.author}</p>
       </PageHeader>
 
-      <main className="max-w-3xl mx-auto px-6 py-8 space-y-8">
+      <main className="max-w-5xl mx-auto px-6 py-8 space-y-8">
         {/* Description */}
         {meta.description && (
           <p className="text-muted-foreground">{meta.description}</p>
diff --git a/app/other-documents/page.tsx b/app/other-documents/page.tsx
index 40dfe103..022b3b87 100644
--- a/app/other-documents/page.tsx
+++ b/app/other-documents/page.tsx
@@ -34,7 +34,7 @@ export default async function OtherDocumentsPage() {
         </p>
       </PageHeader>
 
-      <main className="max-w-6xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <OtherDocumentsGrid items={items} />
       </main>
     </div>
diff --git a/app/page.tsx b/app/page.tsx
index 2bd49798..15a5b43a 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -30,7 +30,7 @@ export default function Home() {
         <Logo height={56} className="mb-1" />
       </PageHeader>
 
-      <main className="max-w-6xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
           {/* Structured Books (JSON) */}
           <Link href="/books" className="block group h-full">
diff --git a/app/rtfs/page.tsx b/app/rtfs/page.tsx
index e69409d2..6ae14faf 100644
--- a/app/rtfs/page.tsx
+++ b/app/rtfs/page.tsx
@@ -52,7 +52,7 @@ export default function RtfsPage() {
           {files.length} original documents from the pre-1978 Vedabase
         </p>
       </PageHeader>
-      <main className="max-w-3xl mx-auto px-6 py-8">
+      <main className="max-w-5xl mx-auto px-6 py-8">
         <Card className="py-0">
           <CardContent className="p-0 divide-y divide-border">
             {fileList.map((file) => (
diff --git a/components/page-header.tsx b/components/page-header.tsx
index c6eb96cb..b82157f4 100644
--- a/components/page-header.tsx
+++ b/components/page-header.tsx
@@ -4,12 +4,10 @@ import { cn } from "@/lib/utils";
 export function PageHeader({
   children,
   sticky = false,
-  wide = false,
   className,
 }: {
   children: React.ReactNode;
   sticky?: boolean;
-  wide?: boolean;
   className?: string;
 }) {
   return (
@@ -20,12 +18,7 @@ export function PageHeader({
         className,
       )}
     >
-      <div
-        className={cn(
-          "mx-auto flex items-start justify-between gap-4",
-          wide ? "max-w-7xl" : "max-w-3xl",
-        )}
-      >
+      <div className="max-w-5xl mx-auto flex items-start justify-between gap-4">
         <div className="flex-1 min-w-0">{children}</div>
         <div className="shrink-0 pt-1">
           <ReadingSettings />
diff --git a/components/site-footer.tsx b/components/site-footer.tsx
index 811c4ab4..9564a99e 100644
--- a/components/site-footer.tsx
+++ b/components/site-footer.tsx
@@ -3,12 +3,10 @@ import Link from "next/link";
 export function SiteFooter() {
   return (
     <footer className="border-t border-border bg-card mt-auto">
-      <div className="max-w-6xl mx-auto px-6 py-6 flex flex-col sm:flex-row items-center justify-between gap-4 text-sm text-muted-foreground">
+      <div className="max-w-5xl mx-auto px-6 py-6 flex flex-col sm:flex-row items-center justify-between gap-4 text-sm text-muted-foreground">
         <p>
           &copy; {new Date().getFullYear()}{" "}
-          <span className="font-medium text-foreground">
-            Prabhupāda Says
-          </span>
+          <span className="font-medium text-foreground">Prabhupāda Says</span>
         </p>
 
         <nav className="flex items-center gap-6">
@@ -18,10 +16,7 @@ export function SiteFooter() {
           >
             About
           </Link>
-          <Link
-            href="/"
-            className="hover:text-foreground transition-colors"
-          >
+          <Link href="/" className="hover:text-foreground transition-colors">
             Home
           </Link>
         </nav>