diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index c10de2f..bf2b62a 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -634,7 +634,7 @@ const AppContent: React.FC = () => {
     const isTrialExpired = business.isTrialExpired || (business.status === 'Trial' && business.trialEnd && new Date(business.trialEnd) < new Date());
 
     // Allowed routes when trial is expired
-    const allowedWhenExpired = ['/trial-expired', '/upgrade', '/settings', '/profile'];
+    const allowedWhenExpired = ['/dashboard/trial-expired', '/dashboard/upgrade', '/dashboard/settings', '/dashboard/profile'];
     const currentPath = window.location.pathname;
     const isOnAllowedRoute = allowedWhenExpired.some(route => currentPath.startsWith(route));
 
@@ -643,15 +643,15 @@ const AppContent: React.FC = () => {
       return (
         <Suspense fallback={<LoadingScreen />}>
           <Routes>
-            <Route path="/trial-expired" element={<TrialExpired />} />
-            <Route path="/upgrade" element={<Upgrade />} />
-            <Route path="/profile" element={<ProfileSettings />} />
+            <Route path="/dashboard/trial-expired" element={<TrialExpired />} />
+            <Route path="/dashboard/upgrade" element={<Upgrade />} />
+            <Route path="/dashboard/profile" element={<ProfileSettings />} />
             {/* Trial-expired users can access billing settings to upgrade */}
             <Route
-              path="/settings/*"
-              element={hasAccess(['owner']) ? <Navigate to="/upgrade" /> : <Navigate to="/trial-expired" />}
+              path="/dashboard/settings/*"
+              element={hasAccess(['owner']) ? <Navigate to="/dashboard/upgrade" /> : <Navigate to="/dashboard/trial-expired" />}
             />
-            <Route path="*" element={<Navigate to="/trial-expired" replace />} />
+            <Route path="*" element={<Navigate to="/dashboard/trial-expired" replace />} />
           </Routes>
         </Suspense>
       );
@@ -672,30 +672,33 @@ const AppContent: React.FC = () => {
               />
             }
           >
+            {/* Redirect root to dashboard */}
+            <Route path="/" element={<Navigate to="/dashboard" replace />} />
+
             {/* Trial and Upgrade Routes */}
-            <Route path="/trial-expired" element={<TrialExpired />} />
-            <Route path="/upgrade" element={<Upgrade />} />
+            <Route path="/dashboard/trial-expired" element={<TrialExpired />} />
+            <Route path="/dashboard/upgrade" element={<Upgrade />} />
 
             {/* Regular Routes */}
             <Route
-              path="/"
+              path="/dashboard"
               element={user.role === 'resource' ? <ResourceDashboard /> : user.role === 'staff' ? <StaffDashboard user={user} /> : <Dashboard />}
             />
             {/* Staff Schedule - vertical timeline view */}
             <Route
-              path="/my-schedule"
+              path="/dashboard/my-schedule"
               element={
                 hasAccess(['staff']) ? (
                   <StaffSchedule user={user} />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
-            <Route path="/scheduler" element={<Scheduler />} />
-            <Route path="/tickets" element={<Tickets />} />
+            <Route path="/dashboard/scheduler" element={<Scheduler />} />
+            <Route path="/dashboard/tickets" element={<Tickets />} />
             <Route
-              path="/help"
+              path="/dashboard/help"
               element={
                 user.role === 'staff' ? (
                   <StaffHelp user={user} />
@@ -704,205 +707,205 @@ const AppContent: React.FC = () => {
                 )
               }
             />
-            <Route path="/help/guide" element={<HelpGuide />} />
-            <Route path="/help/ticketing" element={<HelpTicketing />} />
-            <Route path="/help/api" element={<HelpApiDocs />} />
-            <Route path="/help/plugins/docs" element={<HelpPluginDocs />} />
-            <Route path="/help/email" element={<HelpEmailSettings />} />
+            <Route path="/dashboard/help/guide" element={<HelpGuide />} />
+            <Route path="/dashboard/help/ticketing" element={<HelpTicketing />} />
+            <Route path="/dashboard/help/api" element={<HelpApiDocs />} />
+            <Route path="/dashboard/help/plugins/docs" element={<HelpPluginDocs />} />
+            <Route path="/dashboard/help/email" element={<HelpEmailSettings />} />
             {/* New help pages */}
-            <Route path="/help/dashboard" element={<HelpDashboard />} />
-            <Route path="/help/scheduler" element={<HelpScheduler />} />
-            <Route path="/help/tasks" element={<HelpTasks />} />
-            <Route path="/help/customers" element={<HelpCustomers />} />
-            <Route path="/help/services" element={<HelpServices />} />
-            <Route path="/help/resources" element={<HelpResources />} />
-            <Route path="/help/staff" element={<HelpStaff />} />
-            <Route path="/help/time-blocks" element={<HelpTimeBlocks />} />
-            <Route path="/help/messages" element={<HelpMessages />} />
-            <Route path="/help/payments" element={<HelpPayments />} />
-            <Route path="/help/contracts" element={<HelpContracts />} />
-            <Route path="/help/plugins" element={<HelpPlugins />} />
-            <Route path="/help/settings/general" element={<HelpSettingsGeneral />} />
-            <Route path="/help/settings/resource-types" element={<HelpSettingsResourceTypes />} />
-            <Route path="/help/settings/booking" element={<HelpSettingsBooking />} />
-            <Route path="/help/settings/appearance" element={<HelpSettingsAppearance />} />
-            <Route path="/help/settings/email" element={<HelpSettingsEmail />} />
-            <Route path="/help/settings/domains" element={<HelpSettingsDomains />} />
-            <Route path="/help/settings/api" element={<HelpSettingsApi />} />
-            <Route path="/help/settings/auth" element={<HelpSettingsAuth />} />
-            <Route path="/help/settings/billing" element={<HelpSettingsBilling />} />
-            <Route path="/help/settings/quota" element={<HelpSettingsQuota />} />
+            <Route path="/dashboard/help/dashboard" element={<HelpDashboard />} />
+            <Route path="/dashboard/help/scheduler" element={<HelpScheduler />} />
+            <Route path="/dashboard/help/tasks" element={<HelpTasks />} />
+            <Route path="/dashboard/help/customers" element={<HelpCustomers />} />
+            <Route path="/dashboard/help/services" element={<HelpServices />} />
+            <Route path="/dashboard/help/resources" element={<HelpResources />} />
+            <Route path="/dashboard/help/staff" element={<HelpStaff />} />
+            <Route path="/dashboard/help/time-blocks" element={<HelpTimeBlocks />} />
+            <Route path="/dashboard/help/messages" element={<HelpMessages />} />
+            <Route path="/dashboard/help/payments" element={<HelpPayments />} />
+            <Route path="/dashboard/help/contracts" element={<HelpContracts />} />
+            <Route path="/dashboard/help/plugins" element={<HelpPlugins />} />
+            <Route path="/dashboard/help/settings/general" element={<HelpSettingsGeneral />} />
+            <Route path="/dashboard/help/settings/resource-types" element={<HelpSettingsResourceTypes />} />
+            <Route path="/dashboard/help/settings/booking" element={<HelpSettingsBooking />} />
+            <Route path="/dashboard/help/settings/appearance" element={<HelpSettingsAppearance />} />
+            <Route path="/dashboard/help/settings/email" element={<HelpSettingsEmail />} />
+            <Route path="/dashboard/help/settings/domains" element={<HelpSettingsDomains />} />
+            <Route path="/dashboard/help/settings/api" element={<HelpSettingsApi />} />
+            <Route path="/dashboard/help/settings/auth" element={<HelpSettingsAuth />} />
+            <Route path="/dashboard/help/settings/billing" element={<HelpSettingsBilling />} />
+            <Route path="/dashboard/help/settings/quota" element={<HelpSettingsQuota />} />
             <Route
-              path="/plugins/marketplace"
+              path="/dashboard/plugins/marketplace"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <PluginMarketplace />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/plugins/my-plugins"
+              path="/dashboard/plugins/my-plugins"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <MyPlugins />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/plugins/create"
+              path="/dashboard/plugins/create"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <CreatePlugin />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/tasks"
+              path="/dashboard/tasks"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <Tasks />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/email-templates"
+              path="/dashboard/email-templates"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <EmailTemplates />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
-            <Route path="/support" element={<PlatformSupport />} />
+            <Route path="/dashboard/support" element={<PlatformSupport />} />
             <Route
-              path="/customers"
+              path="/dashboard/customers"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <Customers onMasquerade={handleMasquerade} effectiveUser={user} />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/services"
+              path="/dashboard/services"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <Services />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/resources"
+              path="/dashboard/resources"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <Resources onMasquerade={handleMasquerade} effectiveUser={user} />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/staff"
+              path="/dashboard/staff"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <Staff onMasquerade={handleMasquerade} effectiveUser={user} />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/time-blocks"
+              path="/dashboard/time-blocks"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <TimeBlocks />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/locations"
+              path="/dashboard/locations"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <Locations />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/my-availability"
+              path="/dashboard/my-availability"
               element={
                 hasAccess(['staff', 'resource']) ? (
                   <MyAvailability user={user} />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/contracts"
+              path="/dashboard/contracts"
               element={
                 hasAccess(['owner', 'manager']) && canUse('contracts') ? (
                   <Contracts />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/contracts/templates"
+              path="/dashboard/contracts/templates"
               element={
                 hasAccess(['owner', 'manager']) && canUse('contracts') ? (
                   <ContractTemplates />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/payments"
+              path="/dashboard/payments"
               element={
-                hasAccess(['owner', 'manager']) ? <Payments /> : <Navigate to="/" />
+                hasAccess(['owner', 'manager']) ? <Payments /> : <Navigate to="/dashboard" />
               }
             />
             <Route
-              path="/messages"
+              path="/dashboard/messages"
               element={
                 hasAccess(['owner', 'manager']) && user?.can_send_messages ? (
                   <Messages />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             <Route
-              path="/site-editor"
+              path="/dashboard/site-editor"
               element={
                 hasAccess(['owner', 'manager']) ? (
                   <PageEditor />
                 ) : (
-                  <Navigate to="/" />
+                  <Navigate to="/dashboard" />
                 )
               }
             />
             {/* Settings Routes with Nested Layout */}
             {hasAccess(['owner']) ? (
-              <Route path="/settings" element={<SettingsLayout />}>
-                <Route index element={<Navigate to="/settings/general" replace />} />
+              <Route path="/dashboard/settings" element={<SettingsLayout />}>
+                <Route index element={<Navigate to="/dashboard/settings/general" replace />} />
                 <Route path="general" element={<GeneralSettings />} />
                 <Route path="branding" element={<BrandingSettings />} />
                 <Route path="resource-types" element={<ResourceTypesSettings />} />
@@ -918,11 +921,11 @@ const AppContent: React.FC = () => {
                 <Route path="quota" element={<QuotaSettings />} />
               </Route>
             ) : (
-              <Route path="/settings/*" element={<Navigate to="/" />} />
+              <Route path="/dashboard/settings/*" element={<Navigate to="/dashboard" />} />
             )}
-            <Route path="/profile" element={<ProfileSettings />} />
-            <Route path="/verify-email" element={<VerifyEmail />} />
-            <Route path="*" element={<Navigate to="/" />} />
+            <Route path="/dashboard/profile" element={<ProfileSettings />} />
+            <Route path="/dashboard/verify-email" element={<VerifyEmail />} />
+            <Route path="*" element={<Navigate to="/dashboard" />} />
           </Route>
         </Routes>
       </Suspense>
diff --git a/frontend/src/components/NotificationDropdown.tsx b/frontend/src/components/NotificationDropdown.tsx
index 6963f94..a7473cd 100644
--- a/frontend/src/components/NotificationDropdown.tsx
+++ b/frontend/src/components/NotificationDropdown.tsx
@@ -59,7 +59,7 @@ const NotificationDropdown: React.FC<NotificationDropdownProps> = ({ variant = '
     // Handle time-off request notifications - navigate to time blocks page
     // Includes both new requests and modified requests that need re-approval
     if (notification.data?.type === 'time_off_request' || notification.data?.type === 'time_off_request_modified') {
-      navigate('/time-blocks');
+      navigate('/dashboard/time-blocks');
       setIsOpen(false);
       return;
     }
@@ -224,7 +224,7 @@ const NotificationDropdown: React.FC<NotificationDropdownProps> = ({ variant = '
               </button>
               <button
                 onClick={() => {
-                  navigate('/notifications');
+                  navigate('/dashboard/notifications');
                   setIsOpen(false);
                 }}
                 className="text-xs text-brand-600 hover:text-brand-700 dark:text-brand-400 font-medium"
diff --git a/frontend/src/components/PaymentSettingsSection.tsx b/frontend/src/components/PaymentSettingsSection.tsx
index d7015ed..8966289 100644
--- a/frontend/src/components/PaymentSettingsSection.tsx
+++ b/frontend/src/components/PaymentSettingsSection.tsx
@@ -235,7 +235,7 @@ const PaymentSettingsSection: React.FC<PaymentSettingsSectionProps> = ({ busines
                 </ul>
                 <div className="flex flex-wrap gap-3">
                   <button
-                    onClick={() => navigate('/settings/billing')}
+                    onClick={() => navigate('/dashboard/settings/billing')}
                     className="flex items-center gap-2 px-5 py-2.5 text-sm font-medium text-white bg-purple-600 rounded-lg hover:bg-purple-700 transition-colors"
                   >
                     <ArrowUpRight size={16} />
diff --git a/frontend/src/components/QuotaOverageModal.tsx b/frontend/src/components/QuotaOverageModal.tsx
index 264858a..19efc9d 100644
--- a/frontend/src/components/QuotaOverageModal.tsx
+++ b/frontend/src/components/QuotaOverageModal.tsx
@@ -244,7 +244,7 @@ const QuotaOverageModal: React.FC<QuotaOverageModalProps> = ({ overages, onDismi
             {t('quota.modal.dismissButton', 'Remind Me Later')}
           </button>
           <Link
-            to="/settings/quota"
+            to="/dashboard/settings/quota"
             onClick={handleDismiss}
             className="inline-flex items-center gap-2 px-5 py-2.5 bg-blue-600 text-white font-medium rounded-lg hover:bg-blue-700 transition-colors"
           >
diff --git a/frontend/src/components/QuotaWarningBanner.tsx b/frontend/src/components/QuotaWarningBanner.tsx
index 3f462de..c7f078c 100644
--- a/frontend/src/components/QuotaWarningBanner.tsx
+++ b/frontend/src/components/QuotaWarningBanner.tsx
@@ -78,7 +78,7 @@ const QuotaWarningBanner: React.FC<QuotaWarningBannerProps> = ({ overages, onDis
           </div>
           <div className="flex items-center gap-2">
             <Link
-              to="/settings/quota"
+              to="/dashboard/settings/quota"
               className={`inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium rounded-md transition-colors ${
                 isCritical || isUrgent
                   ? 'bg-white/20 hover:bg-white/30 text-white'
diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index a354d33..01236b6 100644
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -109,7 +109,7 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
         {/* Core Features - Always visible */}
         <SidebarSection isCollapsed={isCollapsed}>
           <SidebarItem
-            to="/"
+            to="/dashboard"
             icon={LayoutDashboard}
             label={t('nav.dashboard')}
             isCollapsed={isCollapsed}
@@ -117,16 +117,15 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
           />
           {!isStaff && (
             <SidebarItem
-              to="/scheduler"
+              to="/dashboard/scheduler"
               icon={CalendarDays}
               label={t('nav.scheduler')}
               isCollapsed={isCollapsed}
-              badgeElement={<UnfinishedBadge />}
             />
           )}
           {!isStaff && (
             <SidebarItem
-              to="/tasks"
+              to="/dashboard/tasks"
               icon={Clock}
               label={t('nav.tasks', 'Tasks')}
               isCollapsed={isCollapsed}
@@ -136,7 +135,7 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
           )}
           {isStaff && (
             <SidebarItem
-              to="/my-schedule"
+              to="/dashboard/my-schedule"
               icon={CalendarDays}
               label={t('nav.mySchedule', 'My Schedule')}
               isCollapsed={isCollapsed}
@@ -144,7 +143,7 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
           )}
           {(role === 'staff' || role === 'resource') && (
             <SidebarItem
-              to="/my-availability"
+              to="/dashboard/my-availability"
               icon={CalendarOff}
               label={t('nav.myAvailability', 'My Availability')}
               isCollapsed={isCollapsed}
@@ -156,27 +155,27 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
         {canViewManagementPages && (
           <SidebarSection title={t('nav.sections.manage', 'Manage')} isCollapsed={isCollapsed}>
             <SidebarItem
-              to="/site-editor"
+              to="/dashboard/site-editor"
               icon={LayoutTemplate}
               label={t('nav.siteBuilder', 'Site Builder')}
               isCollapsed={isCollapsed}
               badgeElement={<UnfinishedBadge />}
             />
             <SidebarItem
-              to="/customers"
+              to="/dashboard/customers"
               icon={Users}
               label={t('nav.customers')}
               isCollapsed={isCollapsed}
               badgeElement={<UnfinishedBadge />}
             />
             <SidebarItem
-              to="/services"
+              to="/dashboard/services"
               icon={Briefcase}
               label={t('nav.services', 'Services')}
               isCollapsed={isCollapsed}
             />
             <SidebarItem
-              to="/resources"
+              to="/dashboard/resources"
               icon={ClipboardList}
               label={t('nav.resources')}
               isCollapsed={isCollapsed}
@@ -184,7 +183,7 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
             {canViewAdminPages && (
               <>
                 <SidebarItem
-                  to="/staff"
+                  to="/dashboard/staff"
                   icon={Users}
                   label={t('nav.staff')}
                   isCollapsed={isCollapsed}
@@ -192,7 +191,7 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
                 />
                 {canUse('contracts') && (
                   <SidebarItem
-                    to="/contracts"
+                    to="/dashboard/contracts"
                     icon={FileSignature}
                     label={t('nav.contracts', 'Contracts')}
                     isCollapsed={isCollapsed}
@@ -200,13 +199,13 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
                   />
                 )}
                 <SidebarItem
-                  to="/time-blocks"
+                  to="/dashboard/time-blocks"
                   icon={CalendarOff}
                   label={t('nav.timeBlocks', 'Time Blocks')}
                   isCollapsed={isCollapsed}
                 />
                 <SidebarItem
-                  to="/locations"
+                  to="/dashboard/locations"
                   icon={MapPin}
                   label={t('nav.locations', 'Locations')}
                   isCollapsed={isCollapsed}
@@ -222,7 +221,7 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
           <SidebarSection title={t('nav.sections.communicate', 'Communicate')} isCollapsed={isCollapsed}>
             {canSendMessages && (
               <SidebarItem
-                to="/messages"
+                to="/dashboard/messages"
                 icon={MessageSquare}
                 label={t('nav.messages')}
                 isCollapsed={isCollapsed}
@@ -230,7 +229,7 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
             )}
             {canViewTickets && (
               <SidebarItem
-                to="/tickets"
+                to="/dashboard/tickets"
                 icon={Ticket}
                 label={t('nav.tickets')}
                 isCollapsed={isCollapsed}
@@ -243,7 +242,7 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
         {canViewAdminPages && (
           <SidebarSection title={t('nav.sections.money', 'Money')} isCollapsed={isCollapsed}>
             <SidebarItem
-              to="/payments"
+              to="/dashboard/payments"
               icon={CreditCard}
               label={t('nav.payments')}
               isCollapsed={isCollapsed}
@@ -256,7 +255,7 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
         {canViewAdminPages && (
           <SidebarSection title={t('nav.sections.extend', 'Extend')} isCollapsed={isCollapsed}>
             <SidebarItem
-              to="/plugins/my-plugins"
+              to="/dashboard/plugins/my-plugins"
               icon={Plug}
               label={t('nav.plugins', 'Plugins')}
               isCollapsed={isCollapsed}
@@ -272,14 +271,14 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
         <SidebarSection isCollapsed={isCollapsed}>
           {canViewSettings && (
             <SidebarItem
-              to="/settings"
+              to="/dashboard/settings"
               icon={Settings}
               label={t('nav.businessSettings')}
               isCollapsed={isCollapsed}
             />
           )}
           <SidebarItem
-            to="/help"
+            to="/dashboard/help"
             icon={HelpCircle}
             label={t('nav.helpDocs', 'Help & Docs')}
             isCollapsed={isCollapsed}
diff --git a/frontend/src/components/TrialBanner.tsx b/frontend/src/components/TrialBanner.tsx
index 5323520..8005a3d 100644
--- a/frontend/src/components/TrialBanner.tsx
+++ b/frontend/src/components/TrialBanner.tsx
@@ -28,7 +28,7 @@ const TrialBanner: React.FC<TrialBannerProps> = ({ business }) => {
   const trialEndDate = business.trialEnd ? new Date(business.trialEnd).toLocaleDateString() : '';
 
   const handleUpgrade = () => {
-    navigate('/upgrade');
+    navigate('/dashboard/upgrade');
   };
 
   const handleDismiss = () => {
diff --git a/frontend/src/components/UpgradePrompt.tsx b/frontend/src/components/UpgradePrompt.tsx
index 014cd56..145d207 100644
--- a/frontend/src/components/UpgradePrompt.tsx
+++ b/frontend/src/components/UpgradePrompt.tsx
@@ -51,7 +51,7 @@ const BannerPrompt: React.FC<{ feature: FeatureKey; showDescription: boolean }>
           </p>
         )}
         <Link
-          to="/settings/billing"
+          to="/dashboard/settings/billing"
           className="inline-flex items-center gap-2 px-4 py-2 rounded-lg bg-gradient-to-r from-amber-500 to-orange-500 text-white font-medium hover:from-amber-600 hover:to-orange-600 transition-all shadow-md hover:shadow-lg"
         >
           <Crown className="w-4 h-4" />
@@ -97,7 +97,7 @@ const OverlayPrompt: React.FC<{
             {FEATURE_DESCRIPTIONS[feature]}
           </p>
           <Link
-            to="/settings/billing"
+            to="/dashboard/settings/billing"
             className="inline-flex items-center gap-2 px-6 py-3 rounded-lg bg-gradient-to-r from-amber-500 to-orange-500 text-white font-medium hover:from-amber-600 hover:to-orange-600 transition-all shadow-md hover:shadow-lg"
           >
             <Crown className="w-5 h-5" />
diff --git a/frontend/src/components/dashboard/OpenTicketsWidget.tsx b/frontend/src/components/dashboard/OpenTicketsWidget.tsx
index fb7b421..788f43f 100644
--- a/frontend/src/components/dashboard/OpenTicketsWidget.tsx
+++ b/frontend/src/components/dashboard/OpenTicketsWidget.tsx
@@ -83,7 +83,7 @@ const OpenTicketsWidget: React.FC<OpenTicketsWidgetProps> = ({
           openTickets.slice(0, 5).map((ticket) => (
             <Link
               key={ticket.id}
-              to="/tickets"
+              to="/dashboard/tickets"
               className={`block p-3 rounded-lg ${getPriorityBg(ticket.priority, ticket.isOverdue)} hover:opacity-80 transition-opacity`}
             >
               <div className="flex items-start justify-between gap-2">
@@ -110,7 +110,7 @@ const OpenTicketsWidget: React.FC<OpenTicketsWidgetProps> = ({
 
       {openTickets.length > 5 && (
         <Link
-          to="/tickets"
+          to="/dashboard/tickets"
           className="mt-3 text-sm text-brand-600 dark:text-brand-400 hover:underline text-center"
         >
           View all {openTickets.length} tickets
diff --git a/frontend/src/layouts/BusinessLayout.tsx b/frontend/src/layouts/BusinessLayout.tsx
index ff926b1..d423966 100644
--- a/frontend/src/layouts/BusinessLayout.tsx
+++ b/frontend/src/layouts/BusinessLayout.tsx
@@ -83,13 +83,13 @@ const BusinessLayoutContent: React.FC<BusinessLayoutProps> = ({ business, user,
   // Check for trial expiration and redirect
   useEffect(() => {
     // Don't check if already on trial-expired page
-    if (location.pathname === '/trial-expired') {
+    if (location.pathname === '/dashboard/trial-expired') {
       return;
     }
 
     // Redirect to trial-expired page if trial has expired
     if (business.isTrialExpired && business.status === 'Trial') {
-      navigate('/trial-expired', { replace: true });
+      navigate('/dashboard/trial-expired', { replace: true });
     }
   }, [business.isTrialExpired, business.status, location.pathname, navigate]);
 
diff --git a/frontend/src/layouts/SettingsLayout.tsx b/frontend/src/layouts/SettingsLayout.tsx
index da7b70f..2324c62 100644
--- a/frontend/src/layouts/SettingsLayout.tsx
+++ b/frontend/src/layouts/SettingsLayout.tsx
@@ -39,11 +39,11 @@ interface ParentContext {
 
 // Map settings pages to their required plan features
 const SETTINGS_PAGE_FEATURES: Record<string, FeatureKey> = {
-  '/settings/branding': 'white_label',
-  '/settings/custom-domains': 'custom_domain',
-  '/settings/api': 'api_access',
-  '/settings/authentication': 'custom_oauth',
-  '/settings/sms-calling': 'sms_reminders',
+  '/dashboard/settings/branding': 'white_label',
+  '/dashboard/settings/custom-domains': 'custom_domain',
+  '/dashboard/settings/api': 'api_access',
+  '/dashboard/settings/authentication': 'custom_oauth',
+  '/dashboard/settings/sms-calling': 'sms_reminders',
 };
 
 const SettingsLayout: React.FC = () => {
@@ -72,7 +72,7 @@ const SettingsLayout: React.FC = () => {
         {/* Back Button */}
         <div className="p-4 border-b border-gray-200 dark:border-gray-700">
           <button
-            onClick={() => navigate('/')}
+            onClick={() => navigate('/dashboard')}
             className="flex items-center gap-2 text-sm text-gray-600 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white transition-colors"
           >
             <ArrowLeft size={16} />
@@ -92,26 +92,26 @@ const SettingsLayout: React.FC = () => {
           {/* Business Section */}
           <SettingsSidebarSection title={t('settings.sections.business', 'Business')}>
             <SettingsSidebarItem
-              to="/settings/general"
+              to="/dashboard/settings/general"
               icon={Building2}
               label={t('settings.general.title', 'General')}
               description={t('settings.general.description', 'Name, timezone, contact')}
             />
             <SettingsSidebarItem
-              to="/settings/resource-types"
+              to="/dashboard/settings/resource-types"
               icon={Layers}
               label={t('settings.resourceTypes.title', 'Resource Types')}
               description={t('settings.resourceTypes.description', 'Staff, rooms, equipment')}
               badgeElement={<UnfinishedBadge />}
             />
             <SettingsSidebarItem
-              to="/settings/booking"
+              to="/dashboard/settings/booking"
               icon={Calendar}
               label={t('settings.booking.title', 'Booking')}
               description={t('settings.booking.description', 'Booking URL, redirects')}
             />
             <SettingsSidebarItem
-              to="/settings/business-hours"
+              to="/dashboard/settings/business-hours"
               icon={Clock}
               label={t('settings.businessHours.title', 'Business Hours')}
               description={t('settings.businessHours.description', 'Operating hours')}
@@ -121,20 +121,20 @@ const SettingsLayout: React.FC = () => {
           {/* Branding Section */}
           <SettingsSidebarSection title={t('settings.sections.branding', 'Branding')}>
             <SettingsSidebarItem
-              to="/settings/branding"
+              to="/dashboard/settings/branding"
               icon={Palette}
               label={t('settings.appearance.title', 'Appearance')}
               description={t('settings.appearance.description', 'Logo, colors, theme')}
               locked={isLocked('white_label')}
             />
             <SettingsSidebarItem
-              to="/settings/email-templates"
+              to="/dashboard/settings/email-templates"
               icon={Mail}
               label={t('settings.emailTemplates.title', 'Email Templates')}
               description={t('settings.emailTemplates.description', 'Customize email designs')}
             />
             <SettingsSidebarItem
-              to="/settings/custom-domains"
+              to="/dashboard/settings/custom-domains"
               icon={Globe}
               label={t('settings.customDomains.title', 'Custom Domains')}
               description={t('settings.customDomains.description', 'Use your own domain')}
@@ -145,7 +145,7 @@ const SettingsLayout: React.FC = () => {
           {/* Integrations Section */}
           <SettingsSidebarSection title={t('settings.sections.integrations', 'Integrations')}>
             <SettingsSidebarItem
-              to="/settings/api"
+              to="/dashboard/settings/api"
               icon={Key}
               label={t('settings.api.title', 'API & Webhooks')}
               description={t('settings.api.description', 'API tokens, webhooks')}
@@ -156,7 +156,7 @@ const SettingsLayout: React.FC = () => {
           {/* Access Section */}
           <SettingsSidebarSection title={t('settings.sections.access', 'Access')}>
             <SettingsSidebarItem
-              to="/settings/authentication"
+              to="/dashboard/settings/authentication"
               icon={Lock}
               label={t('settings.authentication.title', 'Authentication')}
               description={t('settings.authentication.description', 'OAuth, social login')}
@@ -167,13 +167,13 @@ const SettingsLayout: React.FC = () => {
           {/* Communication Section */}
           <SettingsSidebarSection title={t('settings.sections.communication', 'Communication')}>
             <SettingsSidebarItem
-              to="/settings/email"
+              to="/dashboard/settings/email"
               icon={Mail}
               label={t('settings.email.title', 'Email Setup')}
               description={t('settings.email.description', 'Email addresses for tickets')}
             />
             <SettingsSidebarItem
-              to="/settings/sms-calling"
+              to="/dashboard/settings/sms-calling"
               icon={Phone}
               label={t('settings.smsCalling.title', 'SMS & Calling')}
               description={t('settings.smsCalling.description', 'Credits, phone numbers')}
@@ -184,13 +184,13 @@ const SettingsLayout: React.FC = () => {
           {/* Billing Section */}
           <SettingsSidebarSection title={t('settings.sections.billing', 'Billing')}>
             <SettingsSidebarItem
-              to="/settings/billing"
+              to="/dashboard/settings/billing"
               icon={CreditCard}
               label={t('settings.billing.title', 'Plan & Billing')}
               description={t('settings.billing.description', 'Subscription, invoices')}
             />
             <SettingsSidebarItem
-              to="/settings/quota"
+              to="/dashboard/settings/quota"
               icon={AlertTriangle}
               label={t('settings.quota.title', 'Quota Management')}
               description={t('settings.quota.description', 'Usage limits, archiving')}
diff --git a/frontend/src/pages/CreatePlugin.tsx b/frontend/src/pages/CreatePlugin.tsx
index e4991b2..bb8d659 100644
--- a/frontend/src/pages/CreatePlugin.tsx
+++ b/frontend/src/pages/CreatePlugin.tsx
@@ -182,7 +182,7 @@ const CreatePlugin: React.FC = () => {
     },
     onSuccess: (data) => {
       queryClient.invalidateQueries({ queryKey: ['plugin-templates'] });
-      navigate('/plugins/my-plugins');
+      navigate('/dashboard/plugins/my-plugins');
     },
   });
 
@@ -206,7 +206,7 @@ const CreatePlugin: React.FC = () => {
             {t('plugins.upgradeToCreate', 'Plugin creation is available on higher-tier plans. Upgrade your subscription to create custom plugins.')}
           </p>
           <button
-            onClick={() => navigate('/settings/billing')}
+            onClick={() => navigate('/dashboard/settings/billing')}
             className="px-6 py-3 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors font-medium"
           >
             {t('plugins.viewPlans', 'View Plans')}
@@ -221,7 +221,7 @@ const CreatePlugin: React.FC = () => {
       {/* Header */}
       <div className="mb-8">
         <button
-          onClick={() => navigate('/plugins/my-plugins')}
+          onClick={() => navigate('/dashboard/plugins/my-plugins')}
           className="flex items-center gap-2 text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-white mb-4 transition-colors"
         >
           <ArrowLeft size={20} />
@@ -535,7 +535,7 @@ const CreatePlugin: React.FC = () => {
         <div className="flex items-center justify-end gap-4 pt-4 border-t border-gray-200 dark:border-gray-700">
           <button
             type="button"
-            onClick={() => navigate('/plugins/my-plugins')}
+            onClick={() => navigate('/dashboard/plugins/my-plugins')}
             className="px-4 py-2 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
           >
             {t('common.cancel', 'Cancel')}
diff --git a/frontend/src/pages/HelpGuide.tsx b/frontend/src/pages/HelpGuide.tsx
index 39c033c..0624f76 100644
--- a/frontend/src/pages/HelpGuide.tsx
+++ b/frontend/src/pages/HelpGuide.tsx
@@ -44,58 +44,58 @@ const HelpGuide: React.FC = () => {
       title: 'Core Features',
       description: 'Essential tools for managing your scheduling business',
       links: [
-        { label: 'Dashboard', path: '/help/dashboard', icon: <LayoutDashboard size={18} /> },
-        { label: 'Scheduler', path: '/help/scheduler', icon: <Calendar size={18} /> },
-        { label: 'Tasks', path: '/help/tasks', icon: <CheckSquare size={18} /> },
+        { label: 'Dashboard', path: '/dashboard/help/dashboard', icon: <LayoutDashboard size={18} /> },
+        { label: 'Scheduler', path: '/dashboard/help/scheduler', icon: <Calendar size={18} /> },
+        { label: 'Tasks', path: '/dashboard/help/tasks', icon: <CheckSquare size={18} /> },
       ],
     },
     {
       title: 'Manage',
       description: 'Organize your customers, services, and resources',
       links: [
-        { label: 'Customers', path: '/help/customers', icon: <Users size={18} /> },
-        { label: 'Services', path: '/help/services', icon: <Briefcase size={18} /> },
-        { label: 'Resources', path: '/help/resources', icon: <ClipboardList size={18} /> },
-        { label: 'Staff', path: '/help/staff', icon: <UserCog size={18} /> },
-        { label: 'Time Blocks', path: '/help/time-blocks', icon: <CalendarOff size={18} /> },
+        { label: 'Customers', path: '/dashboard/help/customers', icon: <Users size={18} /> },
+        { label: 'Services', path: '/dashboard/help/services', icon: <Briefcase size={18} /> },
+        { label: 'Resources', path: '/dashboard/help/resources', icon: <ClipboardList size={18} /> },
+        { label: 'Staff', path: '/dashboard/help/staff', icon: <UserCog size={18} /> },
+        { label: 'Time Blocks', path: '/dashboard/help/time-blocks', icon: <CalendarOff size={18} /> },
       ],
     },
     {
       title: 'Communicate',
       description: 'Stay connected with your customers',
       links: [
-        { label: 'Messages', path: '/help/messages', icon: <MessageSquare size={18} /> },
-        { label: 'Ticketing', path: '/help/ticketing', icon: <Mail size={18} /> },
+        { label: 'Messages', path: '/dashboard/help/messages', icon: <MessageSquare size={18} /> },
+        { label: 'Ticketing', path: '/dashboard/help/ticketing', icon: <Mail size={18} /> },
       ],
     },
     {
       title: 'Money',
       description: 'Handle payments and track revenue',
       links: [
-        { label: 'Payments', path: '/help/payments', icon: <CreditCard size={18} /> },
+        { label: 'Payments', path: '/dashboard/help/payments', icon: <CreditCard size={18} /> },
       ],
     },
     {
       title: 'Extend',
       description: 'Add functionality with plugins',
       links: [
-        { label: 'Plugins', path: '/help/plugins', icon: <Puzzle size={18} /> },
+        { label: 'Plugins', path: '/dashboard/help/plugins', icon: <Puzzle size={18} /> },
       ],
     },
     {
       title: 'Settings',
       description: 'Configure your business settings',
       links: [
-        { label: 'General Settings', path: '/help/settings/general', icon: <Settings size={18} /> },
-        { label: 'Resource Types', path: '/help/settings/resource-types', icon: <Settings size={18} /> },
-        { label: 'Booking Settings', path: '/help/settings/booking', icon: <Settings size={18} /> },
-        { label: 'Appearance', path: '/help/settings/appearance', icon: <Settings size={18} /> },
-        { label: 'Email Templates', path: '/help/settings/email', icon: <Settings size={18} /> },
-        { label: 'Custom Domains', path: '/help/settings/domains', icon: <Settings size={18} /> },
-        { label: 'API Settings', path: '/help/settings/api', icon: <Settings size={18} /> },
-        { label: 'Authentication', path: '/help/settings/auth', icon: <Settings size={18} /> },
-        { label: 'Billing', path: '/help/settings/billing', icon: <Settings size={18} /> },
-        { label: 'Usage & Quota', path: '/help/settings/quota', icon: <Settings size={18} /> },
+        { label: 'General Settings', path: '/dashboard/help/settings/general', icon: <Settings size={18} /> },
+        { label: 'Resource Types', path: '/dashboard/help/settings/resource-types', icon: <Settings size={18} /> },
+        { label: 'Booking Settings', path: '/dashboard/help/settings/booking', icon: <Settings size={18} /> },
+        { label: 'Appearance', path: '/dashboard/help/settings/appearance', icon: <Settings size={18} /> },
+        { label: 'Email Templates', path: '/dashboard/help/settings/email', icon: <Settings size={18} /> },
+        { label: 'Custom Domains', path: '/dashboard/help/settings/domains', icon: <Settings size={18} /> },
+        { label: 'API Settings', path: '/dashboard/help/settings/api', icon: <Settings size={18} /> },
+        { label: 'Authentication', path: '/dashboard/help/settings/auth', icon: <Settings size={18} /> },
+        { label: 'Billing', path: '/dashboard/help/settings/billing', icon: <Settings size={18} /> },
+        { label: 'Usage & Quota', path: '/dashboard/help/settings/quota', icon: <Settings size={18} /> },
       ],
     },
   ];
@@ -126,19 +126,19 @@ const HelpGuide: React.FC = () => {
           <ol className="space-y-3">
             <li className="flex items-start gap-3">
               <span className="flex-shrink-0 w-6 h-6 rounded-full bg-brand-600 text-white text-sm flex items-center justify-center">1</span>
-              <span className="text-gray-700 dark:text-gray-300">Set up your <Link to="/help/services" className="text-brand-600 hover:underline">services</Link> - what you offer to customers</span>
+              <span className="text-gray-700 dark:text-gray-300">Set up your <Link to="/dashboard/help/services" className="text-brand-600 hover:underline">services</Link> - what you offer to customers</span>
             </li>
             <li className="flex items-start gap-3">
               <span className="flex-shrink-0 w-6 h-6 rounded-full bg-brand-600 text-white text-sm flex items-center justify-center">2</span>
-              <span className="text-gray-700 dark:text-gray-300">Add your <Link to="/help/resources" className="text-brand-600 hover:underline">resources</Link> - staff, rooms, or equipment</span>
+              <span className="text-gray-700 dark:text-gray-300">Add your <Link to="/dashboard/help/resources" className="text-brand-600 hover:underline">resources</Link> - staff, rooms, or equipment</span>
             </li>
             <li className="flex items-start gap-3">
               <span className="flex-shrink-0 w-6 h-6 rounded-full bg-brand-600 text-white text-sm flex items-center justify-center">3</span>
-              <span className="text-gray-700 dark:text-gray-300">Use the <Link to="/help/scheduler" className="text-brand-600 hover:underline">scheduler</Link> to manage appointments</span>
+              <span className="text-gray-700 dark:text-gray-300">Use the <Link to="/dashboard/help/scheduler" className="text-brand-600 hover:underline">scheduler</Link> to manage appointments</span>
             </li>
             <li className="flex items-start gap-3">
               <span className="flex-shrink-0 w-6 h-6 rounded-full bg-brand-600 text-white text-sm flex items-center justify-center">4</span>
-              <span className="text-gray-700 dark:text-gray-300">Track your business with the <Link to="/help/dashboard" className="text-brand-600 hover:underline">dashboard</Link></span>
+              <span className="text-gray-700 dark:text-gray-300">Track your business with the <Link to="/dashboard/help/dashboard" className="text-brand-600 hover:underline">dashboard</Link></span>
             </li>
           </ol>
         </div>
@@ -185,7 +185,7 @@ const HelpGuide: React.FC = () => {
           Can't find what you're looking for? Our support team is ready to help.
         </p>
         <Link
-          to="/tickets"
+          to="/dashboard/tickets"
           className="inline-flex items-center gap-2 px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/HelpTicketing.tsx b/frontend/src/pages/HelpTicketing.tsx
index 683168b..807b2b4 100644
--- a/frontend/src/pages/HelpTicketing.tsx
+++ b/frontend/src/pages/HelpTicketing.tsx
@@ -409,7 +409,7 @@ const HelpTicketing: React.FC = () => {
           )}
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           {t('helpTicketing.moreHelp.goToTickets', 'Go to Tickets')}
diff --git a/frontend/src/pages/MyPlugins.tsx b/frontend/src/pages/MyPlugins.tsx
index eee30f4..15b0cf1 100644
--- a/frontend/src/pages/MyPlugins.tsx
+++ b/frontend/src/pages/MyPlugins.tsx
@@ -284,7 +284,7 @@ const MyPlugins: React.FC = () => {
           </p>
         </div>
         <button
-          onClick={() => navigate('/plugins/marketplace')}
+          onClick={() => navigate('/dashboard/plugins/marketplace')}
           className="flex items-center gap-2 px-4 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors font-medium"
         >
           <Plus className="h-5 w-5" />
@@ -300,7 +300,7 @@ const MyPlugins: React.FC = () => {
             {t('plugins.noPluginsInstalled', 'No plugins installed yet')}
           </p>
           <button
-            onClick={() => navigate('/plugins/marketplace')}
+            onClick={() => navigate('/dashboard/plugins/marketplace')}
             className="inline-flex items-center gap-2 px-4 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors font-medium"
           >
             <Plus className="h-4 w-4" />
@@ -412,7 +412,7 @@ const MyPlugins: React.FC = () => {
                     {/* Schedule button - only if not already scheduled */}
                     {!plugin.scheduledTaskId && (
                       <button
-                        onClick={() => navigate('/tasks')}
+                        onClick={() => navigate('/dashboard/tasks')}
                         className="flex items-center gap-2 px-3 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors text-sm font-medium"
                         title={t('plugins.schedule', 'Schedule')}
                       >
@@ -511,7 +511,7 @@ const MyPlugins: React.FC = () => {
             </p>
             {canCreatePlugins ? (
               <button
-                onClick={() => navigate('/plugins/create')}
+                onClick={() => navigate('/dashboard/plugins/create')}
                 className="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors font-medium"
               >
                 <Plus className="h-4 w-4" />
@@ -519,7 +519,7 @@ const MyPlugins: React.FC = () => {
               </button>
             ) : (
               <Link
-                to="/settings/billing"
+                to="/dashboard/settings/billing"
                 className="inline-flex items-center gap-2 px-4 py-2 rounded-lg bg-gradient-to-r from-amber-500 to-orange-500 text-white font-medium hover:from-amber-600 hover:to-orange-600 transition-all shadow-md hover:shadow-lg"
               >
                 <Crown className="h-4 w-4" />
diff --git a/frontend/src/pages/PluginMarketplace.tsx b/frontend/src/pages/PluginMarketplace.tsx
index 28418f2..695f716 100644
--- a/frontend/src/pages/PluginMarketplace.tsx
+++ b/frontend/src/pages/PluginMarketplace.tsx
@@ -605,7 +605,7 @@ const PluginMarketplace: React.FC = () => {
                     setShowDetailsModal(false);
                     setSelectedPlugin(null);
                     setShowCode(false);
-                    navigate('/plugins/my-plugins');
+                    navigate('/dashboard/plugins/my-plugins');
                   }}
                   className="flex items-center gap-2 px-4 py-2 bg-green-600 text-white rounded-lg hover:bg-green-700 transition-colors font-medium"
                 >
@@ -664,7 +664,7 @@ const PluginMarketplace: React.FC = () => {
                 onClick={() => {
                   setShowWhatsNextModal(false);
                   setSelectedPlugin(null);
-                  navigate('/tasks');
+                  navigate('/dashboard/tasks');
                 }}
                 className="w-full flex items-center gap-4 p-4 border border-gray-200 dark:border-gray-700 rounded-lg hover:border-blue-500 dark:hover:border-blue-500 hover:bg-blue-50 dark:hover:bg-blue-900/20 transition-colors text-left group"
               >
@@ -687,7 +687,7 @@ const PluginMarketplace: React.FC = () => {
                 onClick={() => {
                   setShowWhatsNextModal(false);
                   setSelectedPlugin(null);
-                  navigate('/plugins/my-plugins');
+                  navigate('/dashboard/plugins/my-plugins');
                 }}
                 className="w-full flex items-center gap-4 p-4 border border-gray-200 dark:border-gray-700 rounded-lg hover:border-purple-500 dark:hover:border-purple-500 hover:bg-purple-50 dark:hover:bg-purple-900/20 transition-colors text-left group"
               >
diff --git a/frontend/src/pages/TrialExpired.tsx b/frontend/src/pages/TrialExpired.tsx
index ba0312d..18279bf 100644
--- a/frontend/src/pages/TrialExpired.tsx
+++ b/frontend/src/pages/TrialExpired.tsx
@@ -67,7 +67,7 @@ const TrialExpired: React.FC = () => {
   const paidTierFeatures = getTierFeatures(business.plan);
 
   const handleUpgrade = () => {
-    navigate('/payments');
+    navigate('/dashboard/payments');
   };
 
   const handleDowngrade = () => {
diff --git a/frontend/src/pages/Upgrade.tsx b/frontend/src/pages/Upgrade.tsx
index 399aa74..3b36e53 100644
--- a/frontend/src/pages/Upgrade.tsx
+++ b/frontend/src/pages/Upgrade.tsx
@@ -114,7 +114,7 @@ const Upgrade: React.FC = () => {
       alert(`Upgrading to ${selectedPlan} (${billingPeriod})\nThis would redirect to Stripe Checkout.`);
 
       // After successful payment, redirect to dashboard
-      navigate('/');
+      navigate('/dashboard');
     } catch (err) {
       setError(t('upgrade.errors.processingFailed'));
       console.error('Upgrade error:', err);
diff --git a/frontend/src/pages/help/HelpComprehensive.tsx b/frontend/src/pages/help/HelpComprehensive.tsx
index 66c826b..1495fb5 100644
--- a/frontend/src/pages/help/HelpComprehensive.tsx
+++ b/frontend/src/pages/help/HelpComprehensive.tsx
@@ -104,7 +104,7 @@ const HelpComprehensive: React.FC = () => {
               <h1 className="text-xl font-bold text-gray-900 dark:text-white">{t('helpComprehensive.header.title')}</h1>
             </div>
           </div>
-          <Link to="/tickets" className="text-sm text-brand-600 hover:text-brand-700 dark:text-brand-400">
+          <Link to="/dashboard/tickets" className="text-sm text-brand-600 hover:text-brand-700 dark:text-brand-400">
             {t('helpComprehensive.header.contactSupport')}
           </Link>
         </div>
@@ -194,7 +194,7 @@ const HelpComprehensive: React.FC = () => {
                 <li className="flex items-start gap-3">
                   <span className="flex-shrink-0 w-7 h-7 rounded-full bg-brand-600 text-white text-sm flex items-center justify-center font-medium">1</span>
                   <div>
-                    <Link to="/help/services" onClick={scrollToTop} className="font-medium text-gray-900 dark:text-white hover:text-brand-600 dark:hover:text-brand-400 flex items-center gap-1">
+                    <Link to="/dashboard/help/services" onClick={scrollToTop} className="font-medium text-gray-900 dark:text-white hover:text-brand-600 dark:hover:text-brand-400 flex items-center gap-1">
                       {t('helpComprehensive.gettingStarted.step1Title')}
                       <ChevronRight size={14} className="text-brand-500" />
                     </Link>
@@ -204,7 +204,7 @@ const HelpComprehensive: React.FC = () => {
                 <li className="flex items-start gap-3">
                   <span className="flex-shrink-0 w-7 h-7 rounded-full bg-brand-600 text-white text-sm flex items-center justify-center font-medium">2</span>
                   <div>
-                    <Link to="/help/resources" onClick={scrollToTop} className="font-medium text-gray-900 dark:text-white hover:text-brand-600 dark:hover:text-brand-400 flex items-center gap-1">
+                    <Link to="/dashboard/help/resources" onClick={scrollToTop} className="font-medium text-gray-900 dark:text-white hover:text-brand-600 dark:hover:text-brand-400 flex items-center gap-1">
                       {t('helpComprehensive.gettingStarted.step2Title')}
                       <ChevronRight size={14} className="text-brand-500" />
                     </Link>
@@ -214,7 +214,7 @@ const HelpComprehensive: React.FC = () => {
                 <li className="flex items-start gap-3">
                   <span className="flex-shrink-0 w-7 h-7 rounded-full bg-brand-600 text-white text-sm flex items-center justify-center font-medium">3</span>
                   <div>
-                    <Link to="/help/settings/appearance" onClick={scrollToTop} className="font-medium text-gray-900 dark:text-white hover:text-brand-600 dark:hover:text-brand-400 flex items-center gap-1">
+                    <Link to="/dashboard/help/settings/appearance" onClick={scrollToTop} className="font-medium text-gray-900 dark:text-white hover:text-brand-600 dark:hover:text-brand-400 flex items-center gap-1">
                       {t('helpComprehensive.gettingStarted.step3Title')}
                       <ChevronRight size={14} className="text-brand-500" />
                     </Link>
@@ -224,7 +224,7 @@ const HelpComprehensive: React.FC = () => {
                 <li className="flex items-start gap-3">
                   <span className="flex-shrink-0 w-7 h-7 rounded-full bg-brand-600 text-white text-sm flex items-center justify-center font-medium">4</span>
                   <div>
-                    <Link to="/help/settings/booking" onClick={scrollToTop} className="font-medium text-gray-900 dark:text-white hover:text-brand-600 dark:hover:text-brand-400 flex items-center gap-1">
+                    <Link to="/dashboard/help/settings/booking" onClick={scrollToTop} className="font-medium text-gray-900 dark:text-white hover:text-brand-600 dark:hover:text-brand-400 flex items-center gap-1">
                       {t('helpComprehensive.gettingStarted.step4Title')}
                       <ChevronRight size={14} className="text-brand-500" />
                     </Link>
@@ -234,7 +234,7 @@ const HelpComprehensive: React.FC = () => {
                 <li className="flex items-start gap-3">
                   <span className="flex-shrink-0 w-7 h-7 rounded-full bg-brand-600 text-white text-sm flex items-center justify-center font-medium">5</span>
                   <div>
-                    <Link to="/help/scheduler" onClick={scrollToTop} className="font-medium text-gray-900 dark:text-white hover:text-brand-600 dark:hover:text-brand-400 flex items-center gap-1">
+                    <Link to="/dashboard/help/scheduler" onClick={scrollToTop} className="font-medium text-gray-900 dark:text-white hover:text-brand-600 dark:hover:text-brand-400 flex items-center gap-1">
                       {t('helpComprehensive.gettingStarted.step5Title')}
                       <ChevronRight size={14} className="text-brand-500" />
                     </Link>
@@ -705,7 +705,7 @@ const HelpComprehensive: React.FC = () => {
               </div>
             </div>
 
-            <Link to="/help/time-blocks" onClick={scrollToTop} className="flex items-center gap-3 p-4 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+            <Link to="/dashboard/help/time-blocks" onClick={scrollToTop} className="flex items-center gap-3 p-4 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
               <CalendarOff size={24} className="text-rose-500" />
               <div>
                 <h4 className="font-medium text-gray-900 dark:text-white">{t('helpComprehensive.timeBlocks.timeBlocksDocumentation')}</h4>
@@ -783,7 +783,7 @@ const HelpComprehensive: React.FC = () => {
               </div>
 
               <h3 className="text-lg font-semibold text-gray-900 dark:text-white mb-3">{t('helpComprehensive.plugins.learnMore')}</h3>
-              <Link to="/help/plugins/docs" onClick={scrollToTop} className="flex items-center gap-3 p-4 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+              <Link to="/dashboard/help/plugins/docs" onClick={scrollToTop} className="flex items-center gap-3 p-4 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
                 <Puzzle size={24} className="text-indigo-500" />
                 <div>
                   <h4 className="font-medium text-gray-900 dark:text-white">{t('helpComprehensive.plugins.pluginDocumentation')}</h4>
@@ -921,7 +921,7 @@ const HelpComprehensive: React.FC = () => {
               </ul>
             </div>
 
-            <Link to="/help/contracts" onClick={scrollToTop} className="flex items-center gap-3 p-4 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+            <Link to="/dashboard/help/contracts" onClick={scrollToTop} className="flex items-center gap-3 p-4 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
               <FileSignature size={24} className="text-emerald-500" />
               <div>
                 <h4 className="font-medium text-gray-900 dark:text-white">{t('helpComprehensive.contracts.contractsDocumentation')}</h4>
@@ -1003,27 +1003,27 @@ const HelpComprehensive: React.FC = () => {
                 <div>
                   <h3 className="text-lg font-semibold text-gray-900 dark:text-white mb-2">{t('helpComprehensive.settings.otherSettings')}</h3>
                   <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
-                    <Link to="/help/settings/resource-types" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+                    <Link to="/dashboard/help/settings/resource-types" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
                       <h4 className="font-medium text-gray-900 dark:text-white text-sm">{t('helpComprehensive.settings.resourceTypesLink')}</h4>
                       <p className="text-xs text-gray-500 dark:text-gray-400">{t('helpComprehensive.settings.resourceTypesLinkDesc')}</p>
                     </Link>
-                    <Link to="/help/settings/email" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+                    <Link to="/dashboard/help/settings/email" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
                       <h4 className="font-medium text-gray-900 dark:text-white text-sm">{t('helpComprehensive.settings.emailTemplatesLink')}</h4>
                       <p className="text-xs text-gray-500 dark:text-gray-400">{t('helpComprehensive.settings.emailTemplatesLinkDesc')}</p>
                     </Link>
-                    <Link to="/help/settings/domains" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+                    <Link to="/dashboard/help/settings/domains" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
                       <h4 className="font-medium text-gray-900 dark:text-white text-sm">{t('helpComprehensive.settings.customDomainsLink')}</h4>
                       <p className="text-xs text-gray-500 dark:text-gray-400">{t('helpComprehensive.settings.customDomainsLinkDesc')}</p>
                     </Link>
-                    <Link to="/help/settings/billing" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+                    <Link to="/dashboard/help/settings/billing" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
                       <h4 className="font-medium text-gray-900 dark:text-white text-sm">{t('helpComprehensive.settings.billingLink')}</h4>
                       <p className="text-xs text-gray-500 dark:text-gray-400">{t('helpComprehensive.settings.billingLinkDesc')}</p>
                     </Link>
-                    <Link to="/help/settings/api" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+                    <Link to="/dashboard/help/settings/api" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
                       <h4 className="font-medium text-gray-900 dark:text-white text-sm">{t('helpComprehensive.settings.apiSettingsLink')}</h4>
                       <p className="text-xs text-gray-500 dark:text-gray-400">{t('helpComprehensive.settings.apiSettingsLinkDesc')}</p>
                     </Link>
-                    <Link to="/help/settings/quota" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+                    <Link to="/dashboard/help/settings/quota" onClick={scrollToTop} className="p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
                       <h4 className="font-medium text-gray-900 dark:text-white text-sm">{t('helpComprehensive.settings.usageQuotaLink')}</h4>
                       <p className="text-xs text-gray-500 dark:text-gray-400">{t('helpComprehensive.settings.usageQuotaLinkDesc')}</p>
                     </Link>
@@ -1041,7 +1041,7 @@ const HelpComprehensive: React.FC = () => {
               {t('helpComprehensive.footer.description')}
             </p>
             <button
-              onClick={() => navigate('/tickets')}
+              onClick={() => navigate('/dashboard/tickets')}
               className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
             >
               {t('helpComprehensive.footer.contactSupport')}
diff --git a/frontend/src/pages/help/HelpContracts.tsx b/frontend/src/pages/help/HelpContracts.tsx
index 6e19b61..b2d983b 100644
--- a/frontend/src/pages/help/HelpContracts.tsx
+++ b/frontend/src/pages/help/HelpContracts.tsx
@@ -454,12 +454,12 @@ const HelpContracts: React.FC = () => {
       <section className="mb-10">
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">{t('help.contracts.relatedFeatures.title', 'Related Features')}</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <Link to="/help/services" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/services" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <FileText size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">{t('help.contracts.relatedFeatures.servicesGuide', 'See the Services Guide for linking contracts to services')}</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/customers" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/customers" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Users size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">{t('help.contracts.relatedFeatures.customersGuide', 'See the Customers Guide for managing customer contacts')}</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
@@ -471,7 +471,7 @@ const HelpContracts: React.FC = () => {
         <HelpCircle size={32} className="mx-auto text-brand-500 mb-3" />
         <h3 className="text-lg font-semibold text-gray-900 dark:text-white mb-2">{t('help.contracts.needHelp.title', 'Need Help?')}</h3>
         <p className="text-gray-600 dark:text-gray-300 mb-4">{t('help.contracts.needHelp.description', 'If you have questions about using contracts, our support team is here to help.')}</p>
-        <button onClick={() => navigate('/tickets')} className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors">{t('help.contracts.needHelp.contactSupport', 'Contact Support')}</button>
+        <button onClick={() => navigate('/dashboard/tickets')} className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors">{t('help.contracts.needHelp.contactSupport', 'Contact Support')}</button>
       </section>
     </div>
   );
diff --git a/frontend/src/pages/help/HelpCustomers.tsx b/frontend/src/pages/help/HelpCustomers.tsx
index e788c36..a319409 100644
--- a/frontend/src/pages/help/HelpCustomers.tsx
+++ b/frontend/src/pages/help/HelpCustomers.tsx
@@ -425,7 +425,7 @@ const HelpCustomers: React.FC = () => {
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Features</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/scheduler"
+            to="/dashboard/help/scheduler"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Calendar size={20} className="text-brand-500" />
@@ -433,7 +433,7 @@ const HelpCustomers: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/messages"
+            to="/dashboard/help/messages"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Mail size={20} className="text-brand-500" />
@@ -441,7 +441,7 @@ const HelpCustomers: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/services"
+            to="/dashboard/help/services"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Tag size={20} className="text-brand-500" />
@@ -449,7 +449,7 @@ const HelpCustomers: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/payments"
+            to="/dashboard/help/payments"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <DollarSign size={20} className="text-brand-500" />
@@ -467,7 +467,7 @@ const HelpCustomers: React.FC = () => {
           Our support team is ready to help with any questions about managing customers.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpDashboard.tsx b/frontend/src/pages/help/HelpDashboard.tsx
index a861cbd..66ca110 100644
--- a/frontend/src/pages/help/HelpDashboard.tsx
+++ b/frontend/src/pages/help/HelpDashboard.tsx
@@ -313,7 +313,7 @@ const HelpDashboard: React.FC = () => {
         </h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/scheduler"
+            to="/dashboard/help/scheduler"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Calendar size={20} className="text-brand-500" />
@@ -321,7 +321,7 @@ const HelpDashboard: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/customers"
+            to="/dashboard/help/customers"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Users size={20} className="text-brand-500" />
@@ -341,7 +341,7 @@ const HelpDashboard: React.FC = () => {
           If you have questions that aren't covered here, our support team is ready to help.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpMessages.tsx b/frontend/src/pages/help/HelpMessages.tsx
index e5f56d1..c95bc47 100644
--- a/frontend/src/pages/help/HelpMessages.tsx
+++ b/frontend/src/pages/help/HelpMessages.tsx
@@ -136,12 +136,12 @@ const HelpMessages: React.FC = () => {
       <section className="mb-10">
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Features</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <Link to="/help/customers" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/customers" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Users size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Customers Guide</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/ticketing" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/ticketing" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <MessageSquare size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Ticketing Guide</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
@@ -153,7 +153,7 @@ const HelpMessages: React.FC = () => {
         <HelpCircle size={32} className="mx-auto text-brand-500 mb-3" />
         <h3 className="text-lg font-semibold text-gray-900 dark:text-white mb-2">Need More Help?</h3>
         <p className="text-gray-600 dark:text-gray-300 mb-4">Our support team is ready to help with any questions.</p>
-        <button onClick={() => navigate('/tickets')} className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors">Contact Support</button>
+        <button onClick={() => navigate('/dashboard/tickets')} className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors">Contact Support</button>
       </section>
     </div>
   );
diff --git a/frontend/src/pages/help/HelpPayments.tsx b/frontend/src/pages/help/HelpPayments.tsx
index 09cae98..dd06a23 100644
--- a/frontend/src/pages/help/HelpPayments.tsx
+++ b/frontend/src/pages/help/HelpPayments.tsx
@@ -141,12 +141,12 @@ const HelpPayments: React.FC = () => {
       <section className="mb-10">
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Features</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <Link to="/help/scheduler" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/scheduler" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Calendar size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Scheduler Guide</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/settings/billing" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/billing" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <CreditCard size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Billing Settings</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
@@ -158,7 +158,7 @@ const HelpPayments: React.FC = () => {
         <HelpCircle size={32} className="mx-auto text-brand-500 mb-3" />
         <h3 className="text-lg font-semibold text-gray-900 dark:text-white mb-2">Need More Help?</h3>
         <p className="text-gray-600 dark:text-gray-300 mb-4">Our support team is ready to help with any questions.</p>
-        <button onClick={() => navigate('/tickets')} className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors">Contact Support</button>
+        <button onClick={() => navigate('/dashboard/tickets')} className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors">Contact Support</button>
       </section>
     </div>
   );
diff --git a/frontend/src/pages/help/HelpPlugins.tsx b/frontend/src/pages/help/HelpPlugins.tsx
index 681331b..4e13122 100644
--- a/frontend/src/pages/help/HelpPlugins.tsx
+++ b/frontend/src/pages/help/HelpPlugins.tsx
@@ -238,7 +238,7 @@ const HelpPlugins: React.FC = () => {
                 the scripting language, available API methods, and example code.
               </p>
               <Link
-                to="/help/plugins/docs"
+                to="/dashboard/help/plugins/docs"
                 className="inline-flex items-center gap-2 px-4 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
               >
                 View Developer Docs
@@ -259,7 +259,7 @@ const HelpPlugins: React.FC = () => {
           Our support team is ready to help with any questions about plugins.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpResources.tsx b/frontend/src/pages/help/HelpResources.tsx
index 5c5902d..b83b994 100644
--- a/frontend/src/pages/help/HelpResources.tsx
+++ b/frontend/src/pages/help/HelpResources.tsx
@@ -490,7 +490,7 @@ const HelpResources: React.FC = () => {
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Features</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/scheduler"
+            to="/dashboard/help/scheduler"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Calendar size={20} className="text-brand-500" />
@@ -498,7 +498,7 @@ const HelpResources: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/staff"
+            to="/dashboard/help/staff"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Users size={20} className="text-brand-500" />
@@ -506,7 +506,7 @@ const HelpResources: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/settings/resource-types"
+            to="/dashboard/help/settings/resource-types"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Settings size={20} className="text-brand-500" />
@@ -514,7 +514,7 @@ const HelpResources: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/services"
+            to="/dashboard/help/services"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <ClipboardList size={20} className="text-brand-500" />
@@ -532,7 +532,7 @@ const HelpResources: React.FC = () => {
           Our support team is ready to help with any questions about managing resources.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpScheduler.tsx b/frontend/src/pages/help/HelpScheduler.tsx
index 0a829c3..0460b73 100644
--- a/frontend/src/pages/help/HelpScheduler.tsx
+++ b/frontend/src/pages/help/HelpScheduler.tsx
@@ -595,7 +595,7 @@ const HelpScheduler: React.FC = () => {
         </h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/resources"
+            to="/dashboard/help/resources"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Users size={20} className="text-brand-500" />
@@ -603,7 +603,7 @@ const HelpScheduler: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/services"
+            to="/dashboard/help/services"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Clock size={20} className="text-brand-500" />
@@ -611,7 +611,7 @@ const HelpScheduler: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/customers"
+            to="/dashboard/help/customers"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Users size={20} className="text-brand-500" />
@@ -631,7 +631,7 @@ const HelpScheduler: React.FC = () => {
           If you have questions that aren't covered here, our support team is ready to help.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpServices.tsx b/frontend/src/pages/help/HelpServices.tsx
index 465c4f6..dbd8bf8 100644
--- a/frontend/src/pages/help/HelpServices.tsx
+++ b/frontend/src/pages/help/HelpServices.tsx
@@ -473,7 +473,7 @@ const HelpServices: React.FC = () => {
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Features</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/scheduler"
+            to="/dashboard/help/scheduler"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Clock size={20} className="text-brand-500" />
@@ -481,7 +481,7 @@ const HelpServices: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/resources"
+            to="/dashboard/help/resources"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Users size={20} className="text-brand-500" />
@@ -489,7 +489,7 @@ const HelpServices: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/customers"
+            to="/dashboard/help/customers"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Users size={20} className="text-brand-500" />
@@ -497,7 +497,7 @@ const HelpServices: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/settings/booking"
+            to="/dashboard/help/settings/booking"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Settings size={20} className="text-brand-500" />
@@ -515,7 +515,7 @@ const HelpServices: React.FC = () => {
           Our support team is ready to help with any questions about managing services.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpSettingsApi.tsx b/frontend/src/pages/help/HelpSettingsApi.tsx
index 5ffb24c..c2b80dd 100644
--- a/frontend/src/pages/help/HelpSettingsApi.tsx
+++ b/frontend/src/pages/help/HelpSettingsApi.tsx
@@ -354,7 +354,7 @@ const HelpSettingsApi: React.FC = () => {
         </h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/settings/auth"
+            to="/dashboard/help/settings/auth"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Shield size={20} className="text-brand-500" />
@@ -362,7 +362,7 @@ const HelpSettingsApi: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/plugins"
+            to="/dashboard/help/plugins"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Settings size={20} className="text-brand-500" />
@@ -382,7 +382,7 @@ const HelpSettingsApi: React.FC = () => {
           Our support team is ready to help with API integration questions.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpSettingsAppearance.tsx b/frontend/src/pages/help/HelpSettingsAppearance.tsx
index 03fddf9..90b9e5f 100644
--- a/frontend/src/pages/help/HelpSettingsAppearance.tsx
+++ b/frontend/src/pages/help/HelpSettingsAppearance.tsx
@@ -344,22 +344,22 @@ const HelpSettingsAppearance: React.FC = () => {
       <section className="mb-10">
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Features</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <Link to="/help/settings/general" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/general" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Eye size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">General Settings</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/settings/booking" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/booking" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Upload size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Booking Settings</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/settings/email" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/email" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Image size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Email Settings</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/settings/domains" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/domains" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Palette size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Custom Domains</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
@@ -375,7 +375,7 @@ const HelpSettingsAppearance: React.FC = () => {
           Our support team is ready to help with any branding questions.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpSettingsAuth.tsx b/frontend/src/pages/help/HelpSettingsAuth.tsx
index 3d03e37..b51d4b1 100644
--- a/frontend/src/pages/help/HelpSettingsAuth.tsx
+++ b/frontend/src/pages/help/HelpSettingsAuth.tsx
@@ -337,7 +337,7 @@ const HelpSettingsAuth: React.FC = () => {
         </h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/customers"
+            to="/dashboard/help/customers"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Users size={20} className="text-brand-500" />
@@ -345,7 +345,7 @@ const HelpSettingsAuth: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/settings/api"
+            to="/dashboard/help/settings/api"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Key size={20} className="text-brand-500" />
@@ -365,7 +365,7 @@ const HelpSettingsAuth: React.FC = () => {
           Our support team is ready to help with authentication configuration.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpSettingsBilling.tsx b/frontend/src/pages/help/HelpSettingsBilling.tsx
index d82a0b6..a567dfc 100644
--- a/frontend/src/pages/help/HelpSettingsBilling.tsx
+++ b/frontend/src/pages/help/HelpSettingsBilling.tsx
@@ -331,22 +331,22 @@ const HelpSettingsBilling: React.FC = () => {
       <section className="mb-10">
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Features</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <Link to="/help/settings/quota" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/quota" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Calendar size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Usage & Quota</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/payments" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/payments" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <CreditCard size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Payments Guide</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/settings/general" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/general" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <CheckCircle size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">General Settings</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/settings/appearance" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/appearance" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Crown size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Branding Settings</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
@@ -362,7 +362,7 @@ const HelpSettingsBilling: React.FC = () => {
           Our support team is ready to help with billing questions.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpSettingsBooking.tsx b/frontend/src/pages/help/HelpSettingsBooking.tsx
index 1bec6f3..ddaee8a 100644
--- a/frontend/src/pages/help/HelpSettingsBooking.tsx
+++ b/frontend/src/pages/help/HelpSettingsBooking.tsx
@@ -226,7 +226,7 @@ const HelpSettingsBooking: React.FC = () => {
             yourbusiness.smoothschedule.com), you can set up a custom domain.
           </p>
           <Link
-            to="/settings/custom-domains"
+            to="/dashboard/settings/custom-domains"
             className="inline-flex items-center gap-2 text-brand-600 hover:text-brand-700 dark:text-brand-400 font-medium"
           >
             Set up a custom domain <ChevronRight size={16} />
@@ -273,22 +273,22 @@ const HelpSettingsBooking: React.FC = () => {
       <section className="mb-10">
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Features</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <Link to="/help/settings/general" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/general" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Calendar size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">General Settings</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/settings/appearance" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/appearance" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Share2 size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Appearance Settings</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/services" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/services" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Calendar size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Services Guide</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/settings/domains" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/domains" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Globe size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Custom Domains</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
@@ -304,7 +304,7 @@ const HelpSettingsBooking: React.FC = () => {
           Our support team is ready to help with any questions about your booking setup.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpSettingsDomains.tsx b/frontend/src/pages/help/HelpSettingsDomains.tsx
index 0ca5567..0b4e873 100644
--- a/frontend/src/pages/help/HelpSettingsDomains.tsx
+++ b/frontend/src/pages/help/HelpSettingsDomains.tsx
@@ -367,7 +367,7 @@ const HelpSettingsDomains: React.FC = () => {
         </h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/settings/appearance"
+            to="/dashboard/help/settings/appearance"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Settings size={20} className="text-brand-500" />
@@ -375,7 +375,7 @@ const HelpSettingsDomains: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/settings/booking"
+            to="/dashboard/help/settings/booking"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Globe size={20} className="text-brand-500" />
@@ -395,7 +395,7 @@ const HelpSettingsDomains: React.FC = () => {
           Our support team is ready to help with domain configuration.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpSettingsEmail.tsx b/frontend/src/pages/help/HelpSettingsEmail.tsx
index f3b4adf..6388b0f 100644
--- a/frontend/src/pages/help/HelpSettingsEmail.tsx
+++ b/frontend/src/pages/help/HelpSettingsEmail.tsx
@@ -299,22 +299,22 @@ const HelpSettingsEmail: React.FC = () => {
       <section className="mb-10">
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Features</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <Link to="/help/ticketing" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/ticketing" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Mail size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Ticketing Guide</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/settings/general" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/general" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <CheckCircle size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">General Settings</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/settings/appearance" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/appearance" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Star size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Branding Settings</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/staff" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/staff" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Mail size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Staff Guide</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
@@ -330,7 +330,7 @@ const HelpSettingsEmail: React.FC = () => {
           Our support team is ready to help with email setup questions.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpSettingsGeneral.tsx b/frontend/src/pages/help/HelpSettingsGeneral.tsx
index 6ffa442..ea75410 100644
--- a/frontend/src/pages/help/HelpSettingsGeneral.tsx
+++ b/frontend/src/pages/help/HelpSettingsGeneral.tsx
@@ -273,7 +273,7 @@ const HelpSettingsGeneral: React.FC = () => {
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Settings</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/settings/appearance"
+            to="/dashboard/help/settings/appearance"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Settings size={20} className="text-brand-500" />
@@ -281,7 +281,7 @@ const HelpSettingsGeneral: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/settings/booking"
+            to="/dashboard/help/settings/booking"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Globe size={20} className="text-brand-500" />
@@ -289,7 +289,7 @@ const HelpSettingsGeneral: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/settings/domains"
+            to="/dashboard/help/settings/domains"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Globe size={20} className="text-brand-500" />
@@ -297,7 +297,7 @@ const HelpSettingsGeneral: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/settings/email"
+            to="/dashboard/help/settings/email"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Mail size={20} className="text-brand-500" />
@@ -315,7 +315,7 @@ const HelpSettingsGeneral: React.FC = () => {
           Our support team is ready to help with any questions about general settings.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpSettingsQuota.tsx b/frontend/src/pages/help/HelpSettingsQuota.tsx
index ed864d0..a1f30e0 100644
--- a/frontend/src/pages/help/HelpSettingsQuota.tsx
+++ b/frontend/src/pages/help/HelpSettingsQuota.tsx
@@ -222,7 +222,7 @@ const HelpSettingsQuota: React.FC = () => {
                 resolves the overage without archiving anything.
               </p>
               <Link
-                to="/settings/billing"
+                to="/dashboard/settings/billing"
                 className="inline-flex items-center gap-2 text-sm text-brand-600 dark:text-brand-400 hover:underline"
               >
                 <CreditCard size={14} />
@@ -376,7 +376,7 @@ const HelpSettingsQuota: React.FC = () => {
         </h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/settings/billing"
+            to="/dashboard/help/settings/billing"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <CreditCard size={20} className="text-brand-500" />
@@ -384,7 +384,7 @@ const HelpSettingsQuota: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/resources"
+            to="/dashboard/help/resources"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Briefcase size={20} className="text-brand-500" />
@@ -404,7 +404,7 @@ const HelpSettingsQuota: React.FC = () => {
           Our support team is ready to help with quota management questions.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpSettingsResourceTypes.tsx b/frontend/src/pages/help/HelpSettingsResourceTypes.tsx
index ab2878e..5401088 100644
--- a/frontend/src/pages/help/HelpSettingsResourceTypes.tsx
+++ b/frontend/src/pages/help/HelpSettingsResourceTypes.tsx
@@ -289,22 +289,22 @@ const HelpSettingsResourceTypes: React.FC = () => {
       <section className="mb-10">
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Features</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <Link to="/help/resources" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/resources" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Layers size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Resources Guide</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/staff" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/staff" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Users size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Staff Guide</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/scheduler" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/scheduler" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <Layers size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">Scheduler Guide</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
-          <Link to="/help/settings/general" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
+          <Link to="/dashboard/help/settings/general" className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors">
             <CheckCircle size={20} className="text-brand-500" />
             <span className="text-gray-900 dark:text-white">General Settings</span>
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
@@ -320,7 +320,7 @@ const HelpSettingsResourceTypes: React.FC = () => {
           Our support team is ready to help with resource type questions.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpStaff.tsx b/frontend/src/pages/help/HelpStaff.tsx
index 96f3858..21e9d05 100644
--- a/frontend/src/pages/help/HelpStaff.tsx
+++ b/frontend/src/pages/help/HelpStaff.tsx
@@ -485,7 +485,7 @@ const HelpStaff: React.FC = () => {
         <h2 className="text-xl font-semibold text-gray-900 dark:text-white mb-4">Related Features</h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/resources"
+            to="/dashboard/help/resources"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Calendar size={20} className="text-brand-500" />
@@ -493,7 +493,7 @@ const HelpStaff: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/scheduler"
+            to="/dashboard/help/scheduler"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Clock size={20} className="text-brand-500" />
@@ -501,7 +501,7 @@ const HelpStaff: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/settings/auth"
+            to="/dashboard/help/settings/auth"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Shield size={20} className="text-brand-500" />
@@ -509,7 +509,7 @@ const HelpStaff: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/customers"
+            to="/dashboard/help/customers"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Users size={20} className="text-brand-500" />
@@ -527,7 +527,7 @@ const HelpStaff: React.FC = () => {
           Our support team is ready to help with any questions about managing staff.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/HelpTasks.tsx b/frontend/src/pages/help/HelpTasks.tsx
index 52724d8..7172d10 100644
--- a/frontend/src/pages/help/HelpTasks.tsx
+++ b/frontend/src/pages/help/HelpTasks.tsx
@@ -311,7 +311,7 @@ const HelpTasks: React.FC = () => {
         </h2>
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <Link
-            to="/help/plugins-overview"
+            to="/dashboard/help/plugins-overview"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <Zap size={20} className="text-brand-500" />
@@ -319,7 +319,7 @@ const HelpTasks: React.FC = () => {
             <ChevronRight size={16} className="text-gray-400 ml-auto" />
           </Link>
           <Link
-            to="/help/plugins"
+            to="/dashboard/help/plugins"
             className="flex items-center gap-3 p-4 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 hover:border-brand-500 transition-colors"
           >
             <FileText size={20} className="text-brand-500" />
@@ -339,7 +339,7 @@ const HelpTasks: React.FC = () => {
           If you have questions that aren't covered here, our support team is ready to help.
         </p>
         <button
-          onClick={() => navigate('/tickets')}
+          onClick={() => navigate('/dashboard/tickets')}
           className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
         >
           Contact Support
diff --git a/frontend/src/pages/help/StaffHelp.tsx b/frontend/src/pages/help/StaffHelp.tsx
index c676c8e..daef813 100644
--- a/frontend/src/pages/help/StaffHelp.tsx
+++ b/frontend/src/pages/help/StaffHelp.tsx
@@ -956,7 +956,7 @@ const StaffHelp: React.FC<StaffHelpProps> = ({ user }) => {
                 )}
               </p>
               <button
-                onClick={() => navigate('/tickets')}
+                onClick={() => navigate('/dashboard/tickets')}
                 className="px-6 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors"
               >
                 {t('staffHelp.footer.openTicket', 'Open a Ticket')}
diff --git a/frontend/src/pages/platform/components/BusinessEditModal.tsx b/frontend/src/pages/platform/components/BusinessEditModal.tsx
index 2d7ba3f..b4e1da7 100644
--- a/frontend/src/pages/platform/components/BusinessEditModal.tsx
+++ b/frontend/src/pages/platform/components/BusinessEditModal.tsx
@@ -11,6 +11,7 @@ import {
 import { PlatformBusiness, getCustomTier, updateCustomTier, deleteCustomTier } from '../../../api/platform';
 import DynamicFeaturesEditor from '../../../components/platform/DynamicFeaturesEditor';
 import { TenantCustomTier } from '../../../types';
+import { buildSubdomainUrl } from '../../../utils/domain';
 
 interface BusinessEditModalProps {
   business: PlatformBusiness | null;
@@ -445,7 +446,7 @@ const BusinessEditModal: React.FC<BusinessEditModalProps> = ({ business, isOpen,
               Access the public-facing website builder for this business. Current limit: {(featureValues.max_public_pages === null || featureValues.max_public_pages === -1) ? 'unlimited' : (featureValues.max_public_pages ?? 0)} page{(featureValues.max_public_pages ?? 0) !== 1 ? 's' : ''}.
             </p>
             <a
-              href={`http://${business.subdomain}.lvh.me:5173/site-editor`}
+              href={buildSubdomainUrl(business.subdomain, '/dashboard/site-editor')}
               target="_blank"
               rel="noopener noreferrer"
               className="inline-flex items-center gap-2 px-4 py-2 bg-indigo-50 dark:bg-indigo-900/20 text-indigo-600 dark:text-indigo-400 rounded-lg hover:bg-indigo-100 dark:hover:bg-indigo-900/30 font-medium text-sm transition-colors"
diff --git a/frontend/src/pages/settings/CustomDomainsSettings.tsx b/frontend/src/pages/settings/CustomDomainsSettings.tsx
index 1e2c97e..f9c1471 100644
--- a/frontend/src/pages/settings/CustomDomainsSettings.tsx
+++ b/frontend/src/pages/settings/CustomDomainsSettings.tsx
@@ -134,7 +134,7 @@ const CustomDomainsSettings: React.FC = () => {
         {isCustomDomainLocked && (
           <div className="absolute inset-0 z-10 bg-white/70 dark:bg-gray-900/70 backdrop-blur-[2px] rounded-xl flex items-center justify-center">
             <Link
-              to="/settings/billing"
+              to="/dashboard/settings/billing"
               className="inline-flex items-center gap-2 px-6 py-3 bg-gradient-to-r from-amber-500 to-orange-500 text-white font-semibold rounded-lg shadow-lg hover:from-amber-600 hover:to-orange-600 transition-all"
             >
               <Lock size={18} />
diff --git a/frontend/src/pages/settings/QuotaSettings.tsx b/frontend/src/pages/settings/QuotaSettings.tsx
index 161c378..744ddef 100644
--- a/frontend/src/pages/settings/QuotaSettings.tsx
+++ b/frontend/src/pages/settings/QuotaSettings.tsx
@@ -436,7 +436,7 @@ const QuotaSettings: React.FC = () => {
                       )}
                     </button>
                     <Link
-                      to="/settings/billing"
+                      to="/dashboard/settings/billing"
                       className="flex items-center gap-2 px-4 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700"
                     >
                       {t('quota.page.upgradeInstead', 'Upgrade Plan Instead')}