diff --git a/CLAUDE.md b/CLAUDE.md
index 341b070f..409db054 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -42,6 +42,11 @@
 
 When adding new pages/components: use "ResolutionFlow" branding, ice-cyan gradient accent theme, `.glass-card` / `.glass-card-static` containers, `text-foreground`/`text-muted-foreground` hierarchy. Primary actions use `bg-gradient-brand`. Pages render inside the app shell (CSS Grid: topbar + sidebar + main). Use "Flows" not "Trees" in all user-facing text; use "Projects" not "Procedures" for procedural flows. Reference [UI-DESIGN-SYSTEM.md](UI-DESIGN-SYSTEM.md) for layout patterns, navigation, and component specs.
 
+## Implementation Principles
+
+- Prefer correct architecture over minimal diff
+- If two approaches exist, implement the one that scales, not the one that's faster to write
+- Flag any "simpler approach" tradeoffs for product owner review before proceeding
 ---
 
 ## Current State
diff --git a/frontend/src/components/account/AccountLayout.tsx b/frontend/src/components/account/AccountLayout.tsx
index ec3c18f9..1659e3be 100644
--- a/frontend/src/components/account/AccountLayout.tsx
+++ b/frontend/src/components/account/AccountLayout.tsx
@@ -2,7 +2,7 @@ import { Outlet } from 'react-router-dom'
 
 export function AccountLayout() {
   return (
-    <div className="container mx-auto max-w-(--breakpoint-lg) px-4 py-6">
+    <div className="overflow-y-auto h-full container mx-auto max-w-(--breakpoint-lg) px-4 py-6">
       <Outlet />
     </div>
   )
diff --git a/frontend/src/components/layout/ViewTransitionOutlet.tsx b/frontend/src/components/layout/ViewTransitionOutlet.tsx
index f6d8f233..5312a23a 100644
--- a/frontend/src/components/layout/ViewTransitionOutlet.tsx
+++ b/frontend/src/components/layout/ViewTransitionOutlet.tsx
@@ -19,7 +19,7 @@ export function ViewTransitionOutlet() {
   const routeKey = segments.slice(0, 2).join('/') || '/'
 
   return (
-    <div key={routeKey} className="flex-1 min-h-0 overflow-y-auto animate-fade-in-up">
+    <div key={routeKey} className="flex-1 min-h-0 animate-fade-in-up">
       <Outlet />
     </div>
   )
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 360dcb53..e4136119 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -306,7 +306,8 @@
   .main-content {
     min-height: 0;
     min-width: 0;
-    overflow-y: auto;
+    /* Each page handles its own scrolling — full-height pages use
+       overflow-hidden, scrollable pages use overflow-y-auto */
   }
 
   @media (max-width: 767px) {
diff --git a/frontend/src/pages/BatchStatusPage.tsx b/frontend/src/pages/BatchStatusPage.tsx
index 0bf98bc1..7d23a6b2 100644
--- a/frontend/src/pages/BatchStatusPage.tsx
+++ b/frontend/src/pages/BatchStatusPage.tsx
@@ -99,7 +99,7 @@ export default function BatchStatusPage() {
   const progressPercent = total > 0 ? Math.round((completed / total) * 100) : 0
 
   return (
-    <div className="container mx-auto max-w-3xl space-y-6 px-4 py-6 sm:px-6 sm:py-8">
+    <div className="overflow-y-auto h-full container mx-auto max-w-3xl space-y-6 px-4 py-6 sm:px-6 sm:py-8">
       {/* Breadcrumb */}
       <div className="flex items-center justify-between">
         <button
diff --git a/frontend/src/pages/FeedbackPage.tsx b/frontend/src/pages/FeedbackPage.tsx
index 38ba85f6..271ff096 100644
--- a/frontend/src/pages/FeedbackPage.tsx
+++ b/frontend/src/pages/FeedbackPage.tsx
@@ -131,7 +131,7 @@ export function FeedbackPage() {
   }
 
   return (
-    <>
+    <div className="overflow-y-auto h-full">
     <PageMeta title="Feedback" />
     <div className="container mx-auto px-4 py-6 sm:px-6 sm:py-8">
       {/* Page header */}
@@ -276,7 +276,7 @@ export function FeedbackPage() {
         )}
       </div>
     </div>
-    </>
+    </div>
   )
 }
 
diff --git a/frontend/src/pages/GuideDetailPage.tsx b/frontend/src/pages/GuideDetailPage.tsx
index 95e7c84d..a096852a 100644
--- a/frontend/src/pages/GuideDetailPage.tsx
+++ b/frontend/src/pages/GuideDetailPage.tsx
@@ -9,7 +9,7 @@ export default function GuideDetailPage() {
 
   if (!guide) {
     return (
-      <div className="flex flex-col items-center justify-center h-full text-center p-6">
+      <div className="flex flex-col items-center justify-center h-full text-center p-6 overflow-y-auto">
         <h2 className="text-lg font-heading font-semibold text-foreground mb-2">Guide Not Found</h2>
         <p className="text-sm text-muted-foreground mb-4">The guide you're looking for doesn't exist.</p>
         <Link
@@ -25,7 +25,7 @@ export default function GuideDetailPage() {
   const Icon = guide.icon
 
   return (
-    <div className="p-6 max-w-3xl mx-auto">
+    <div className="overflow-y-auto h-full p-6 max-w-3xl mx-auto">
       {/* Breadcrumb */}
       <nav className="flex items-center gap-1.5 text-xs text-muted-foreground mb-6">
         <Link to="/guides" className="hover:text-primary transition-colors">
diff --git a/frontend/src/pages/GuidesHubPage.tsx b/frontend/src/pages/GuidesHubPage.tsx
index 69d3ec97..a0809c70 100644
--- a/frontend/src/pages/GuidesHubPage.tsx
+++ b/frontend/src/pages/GuidesHubPage.tsx
@@ -5,7 +5,7 @@ import { GuideCard } from '@/components/guides/GuideCard'
 
 export default function GuidesHubPage() {
   return (
-    <>
+    <div className="overflow-y-auto h-full">
     <PageMeta title="Guides" />
     <div className="p-6 max-w-5xl mx-auto">
       {/* Header */}
@@ -28,6 +28,6 @@ export default function GuidesHubPage() {
         ))}
       </div>
     </div>
-    </>
+    </div>
   )
 }
diff --git a/frontend/src/pages/MaintenanceFlowDetailPage.tsx b/frontend/src/pages/MaintenanceFlowDetailPage.tsx
index caec519c..12d388d0 100644
--- a/frontend/src/pages/MaintenanceFlowDetailPage.tsx
+++ b/frontend/src/pages/MaintenanceFlowDetailPage.tsx
@@ -124,7 +124,7 @@ export default function MaintenanceFlowDetailPage() {
   const hasActiveBatch = recentSessions.some(s => s.started_at && !s.completed_at && s.batch_id)
 
   return (
-    <div className="container mx-auto max-w-4xl space-y-6 px-4 py-6 sm:px-6 sm:py-8">
+    <div className="overflow-y-auto h-full container mx-auto max-w-4xl space-y-6 px-4 py-6 sm:px-6 sm:py-8">
       {/* Active batch banner */}
       {hasActiveBatch && !bannerDismissed && (
         <ActiveBatchBanner
diff --git a/frontend/src/pages/MySharesPage.tsx b/frontend/src/pages/MySharesPage.tsx
index 259e3dce..373ae67d 100644
--- a/frontend/src/pages/MySharesPage.tsx
+++ b/frontend/src/pages/MySharesPage.tsx
@@ -122,7 +122,7 @@ export default function MySharesPage() {
   }
 
   return (
-    <>
+    <div className="overflow-y-auto h-full">
     <PageMeta title="My Shares" />
     <div className="container mx-auto px-4 py-6 sm:px-6 sm:py-8">
       {/* Back link */}
@@ -244,6 +244,6 @@ export default function MySharesPage() {
         confirmLabel="Revoke"
       />
     </div>
-    </>
+    </div>
   )
 }
diff --git a/frontend/src/pages/MyTreesPage.tsx b/frontend/src/pages/MyTreesPage.tsx
index d65b2094..1be76b7d 100644
--- a/frontend/src/pages/MyTreesPage.tsx
+++ b/frontend/src/pages/MyTreesPage.tsx
@@ -118,7 +118,7 @@ export function MyTreesPage() {
   }
 
   return (
-    <>
+    <div className="overflow-y-auto h-full">
     <PageMeta title="My Flows" />
     <div className="container mx-auto px-4 py-6 sm:px-6 sm:py-8">
       <div className="mb-6 flex items-center justify-between sm:mb-8">
@@ -393,7 +393,7 @@ export function MyTreesPage() {
       )}
 
     </div>
-    </>
+    </div>
   )
 }
 
diff --git a/frontend/src/pages/QuickStartPage.tsx b/frontend/src/pages/QuickStartPage.tsx
index 09d18670..b3149bea 100644
--- a/frontend/src/pages/QuickStartPage.tsx
+++ b/frontend/src/pages/QuickStartPage.tsx
@@ -278,7 +278,7 @@ export function QuickStartPage() {
   ]
 
   return (
-    <>
+    <div className="overflow-y-auto h-full">
     <PageMeta title="Dashboard" />
     <div className="p-6 space-y-6">
       {/* Greeting */}
@@ -649,7 +649,7 @@ export function QuickStartPage() {
       )}
 
     </div>
-    </>
+    </div>
   )
 }
 
diff --git a/frontend/src/pages/SessionDetailPage.tsx b/frontend/src/pages/SessionDetailPage.tsx
index 71710514..41e431fd 100644
--- a/frontend/src/pages/SessionDetailPage.tsx
+++ b/frontend/src/pages/SessionDetailPage.tsx
@@ -340,7 +340,7 @@ export function SessionDetailPage() {
   const outcomeConfig = session.outcome ? OUTCOME_CONFIG[session.outcome] : null
 
   return (
-    <div className="container mx-auto px-4 py-6 sm:px-6 sm:py-8">
+    <div className="overflow-y-auto h-full container mx-auto px-4 py-6 sm:px-6 sm:py-8">
       {/* Back nav */}
       <button
         onClick={() => navigate('/sessions')}
diff --git a/frontend/src/pages/SessionHistoryPage.tsx b/frontend/src/pages/SessionHistoryPage.tsx
index f205a6be..c1dc8bfa 100644
--- a/frontend/src/pages/SessionHistoryPage.tsx
+++ b/frontend/src/pages/SessionHistoryPage.tsx
@@ -156,7 +156,7 @@ export function SessionHistoryPage() {
   }
 
   return (
-    <>
+    <div className="overflow-y-auto h-full">
     <PageMeta title="Session History" />
     <div className="container mx-auto px-4 py-6 sm:px-6 sm:py-8">
       <div className="mb-8">
@@ -316,7 +316,7 @@ export function SessionHistoryPage() {
         </>
       )}
     </div>
-    </>
+    </div>
   )
 }
 
diff --git a/frontend/src/pages/TreeLibraryPage.tsx b/frontend/src/pages/TreeLibraryPage.tsx
index ce88407e..76b0a67d 100644
--- a/frontend/src/pages/TreeLibraryPage.tsx
+++ b/frontend/src/pages/TreeLibraryPage.tsx
@@ -266,7 +266,7 @@ export function TreeLibraryPage() {
     selectedCategoryId || selectedTags.length > 0 || searchQuery || selectedFolderId
 
   return (
-    <>
+    <div className="overflow-y-auto h-full">
     <PageMeta title="Flow Library" />
     <div className="min-h-full">
       <div className="container mx-auto px-4 py-6 sm:px-6 sm:py-8">
@@ -599,7 +599,7 @@ export function TreeLibraryPage() {
         />
       )}
     </div>
-    </>
+    </div>
   )
 }