diff --git a/src/App.jsx b/src/App.jsx
index 56d854d..cb99769 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,21 +1,66 @@
-import React from 'react'
+import React, { Suspense, Component } from 'react'
 import { Routes, Route, Navigate } from 'react-router-dom'
 import { AppProvider } from './context/AppContext'
 import { ThemeProvider } from './context/ThemeContext'
 import Navbar          from './components/Navbar'
 import RateLimitBanner from './components/RateLimitBanner'
-import HomePage        from './pages/HomePage'
-import OverviewPage    from './pages/OverviewPage'
-import RepositoriesPage from './pages/RepositoriesPage'
-import ContributorsPage from './pages/ContributorsPage'
-import ContributorProfilePage from './pages/ContributorProfilePage'
-import NetworkPage     from './pages/NetworkPage'
-import AnalyticsPage   from './pages/AnalyticsPage'
-import GovernancePage  from './pages/GovernancePage'
-import SettingsPage    from './pages/SettingsPage'
-import Footer from './components/layout/Footer'
-import Support from './pages/Support'
+import Footer          from './components/layout/Footer'
 import RequireAnalysis from './components/RequireAnalysis'
+import { Spinner }     from './components/UI'
+
+const HomePage               = React.lazy(() => import('./pages/HomePage'))
+const OverviewPage           = React.lazy(() => import('./pages/OverviewPage'))
+const RepositoriesPage        = React.lazy(() => import('./pages/RepositoriesPage'))
+const ContributorsPage       = React.lazy(() => import('./pages/ContributorsPage'))
+const ContributorProfilePage = React.lazy(() => import('./pages/ContributorProfilePage'))
+const NetworkPage            = React.lazy(() => import('./pages/NetworkPage'))
+const AnalyticsPage          = React.lazy(() => import('./pages/AnalyticsPage'))
+const GovernancePage         = React.lazy(() => import('./pages/GovernancePage'))
+const SettingsPage           = React.lazy(() => import('./pages/SettingsPage'))
+const ROUTE_STRINGS = {
+  ERROR_TITLE: 'Unable to load page',
+  ERROR_MESSAGE: 'An error occurred while loading this page.',
+  RELOAD_BUTTON: 'Reload Page',
+  LOADING_LABEL: 'Loading page',
+}
+
+class ErrorBoundary extends Component {
+  constructor(props) {
+    super(props)
+    this.state = { hasError: false }
+  }
+
+  static getDerivedStateFromError() {
+    return { hasError: true }
+  }
+
+  componentDidCatch(error, errorInfo) {
+    console.error('Route load error:', error, errorInfo)
+  }
+
+  render() {
+    if (this.state.hasError) {
+      return (
+        <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', padding: '64px 16px', textAlign: 'center' }}>
+          <h3>{ROUTE_STRINGS.ERROR_TITLE}</h3>
+          <p style={{ color: 'var(--text2)', marginBottom: '16px' }}>{ROUTE_STRINGS.ERROR_MESSAGE}</p>
+          <button className="btn btn-primary" onClick={() => window.location.reload()}>
+            {ROUTE_STRINGS.RELOAD_BUTTON}
+          </button>
+        </div>
+      )
+    }
+    return this.props.children
+  }
+}
+
+function PageLoader() {
+  return (
+    <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', minHeight: '60vh' }} role="status" aria-label={ROUTE_STRINGS.LOADING_LABEL}>
+      <Spinner size={36} />
+    </div>
+  )
+}
 
 function Layout({ children }) {
   return (
@@ -31,19 +76,23 @@ function Layout({ children }) {
 function AppContent() {
   return (
     <Layout>
-      <Routes>
-        <Route path="/"             element={<HomePage />} />
-        <Route path="/overview"     element={<RequireAnalysis><OverviewPage /></RequireAnalysis>} />
-        <Route path="/repositories" element={<RequireAnalysis><RepositoriesPage /></RequireAnalysis>} />
-        <Route path="/contributors" element={<RequireAnalysis><ContributorsPage /></RequireAnalysis>} />
-        <Route path="/contributors/:username" element={<RequireAnalysis><ContributorProfilePage /></RequireAnalysis>} />
-        <Route path="/network"      element={<RequireAnalysis><NetworkPage /></RequireAnalysis>} />
-        <Route path="/analytics"    element={<RequireAnalysis><AnalyticsPage /></RequireAnalysis>} />
-        <Route path="/governance"   element={<RequireAnalysis><GovernancePage /></RequireAnalysis>} />
-        <Route path="/settings"     element={<SettingsPage />} />
-        <Route path="/support-us"      element={<Support />} />
-        <Route path="*"             element={<Navigate to="/" replace />} />
-      </Routes>
+      <ErrorBoundary>
+        <Suspense fallback={<PageLoader />}>
+          <Routes>
+            <Route path="/"             element={<HomePage />} />
+            <Route path="/overview"     element={<RequireAnalysis><OverviewPage /></RequireAnalysis>} />
+            <Route path="/repositories" element={<RequireAnalysis><RepositoriesPage /></RequireAnalysis>} />
+            <Route path="/contributors" element={<RequireAnalysis><ContributorsPage /></RequireAnalysis>} />
+            <Route path="/contributors/:username" element={<RequireAnalysis><ContributorProfilePage /></RequireAnalysis>} />
+            <Route path="/network"      element={<RequireAnalysis><NetworkPage /></RequireAnalysis>} />
+            <Route path="/analytics"    element={<RequireAnalysis><AnalyticsPage /></RequireAnalysis>} />
+            <Route path="/governance"   element={<RequireAnalysis><GovernancePage /></RequireAnalysis>} />
+            <Route path="/settings"     element={<SettingsPage />} />
+            <Route path="/support-us"   element={<Support />} />
+            <Route path="*"             element={<Navigate to="/" replace />} />
+          </Routes>
+        </Suspense>
+      </ErrorBoundary>
     </Layout>
   )
 }