diff --git a/packages/studiocms_dashboard/src/components/Footer.astro b/packages/studiocms_dashboard/src/components/Footer.astro
index 24c5860c2..dcaabed3c 100644
--- a/packages/studiocms_dashboard/src/components/Footer.astro
+++ b/packages/studiocms_dashboard/src/components/Footer.astro
@@ -3,8 +3,13 @@
 const year = new Date().getFullYear();
 
 const footerYear = year === 2024 ? year : `2024 - ${year}`;
+
+const repoLink = 'https://github.com/withstudiocms/studiocms/';
+const licenseLink =
+	'https://github.com/withstudiocms/studiocms/blob/main/packages/studiocms/LICENSE';
+const contributorsLink = 'https://github.com/withstudiocms/studiocms/graphs/contributors';
 ---
 <footer class="dashboard-footer">
-    <span>&copy; {footerYear} <a href="https://github.com/withstudiocms/studiocms/">withstudiocms/studiocms</a> ― <a href="https://github.com/withstudiocms/studiocms/blob/main/packages/studiocms/LICENSE"><strong>MIT License</strong></a></span>
-    <span>Developed By <a href="https://github.com/withstudiocms/studiocms/graphs/contributors"><strong>The StudioCMS Contributors</strong></a></span>
+    <span>&copy; {footerYear} <a href={repoLink}>withstudiocms/studiocms</a> ― <a href={licenseLink}><strong>MIT License</strong></a></span>
+    <span>Developed By <a href={contributorsLink}><strong>The StudioCMS Contributors</strong></a></span>
   </footer>
\ No newline at end of file
diff --git a/packages/studiocms_dashboard/src/components/Layout.astro b/packages/studiocms_dashboard/src/components/Layout.astro
index fe157c202..82b7d942c 100644
--- a/packages/studiocms_dashboard/src/components/Layout.astro
+++ b/packages/studiocms_dashboard/src/components/Layout.astro
@@ -41,27 +41,27 @@ const description = propDescription ?? dbConfig.description;
   <body>
     <Toaster />
     { requiredPermission !== 'none' && ( 
-      <>
-      { 
-        pagePreRendered 
+      <> { pagePreRendered 
         ? <LoginChecker requiredPermission={requiredPermission} server:defer /> 
         : <LoginChecker requiredPermission={requiredPermission} /> 
-      }
-      </>
+      } </>
      ) }
     { sidebar === 'single' && <SingleSidebar {pagePreRendered} /> }
     { sidebar === 'double' && <DoubleSidebar {pagePreRendered} /> }
+
     <main>
       { sidebar !== false && (
         <Button variant="outlined" color="primary" class="nav-toggle" id={'nav-toggle'}>
           <Icon name="bars-3" height={24} width={24} />
-        </Button>
-      )}
+        </Button> )}
       <div class="container">
+
         <div class="page-header">
           <slot name="header" />
         </div>
+
         <slot />
+
       </div>
 
       { footer && <Footer /> }
diff --git a/packages/studiocms_dashboard/src/routes/content-management.astro b/packages/studiocms_dashboard/src/routes/content-management.astro
index 5a9c847b1..91ef45ce2 100644
--- a/packages/studiocms_dashboard/src/routes/content-management.astro
+++ b/packages/studiocms_dashboard/src/routes/content-management.astro
@@ -2,6 +2,7 @@
 import { prerenderRoutes as pagePreRendered } from 'studiocms:mode';
 // import { useTranslations } from 'studiocms:i18n';
 import { Layout } from '../components';
+import PageHeader from '../components/PageHeader.astro';
 
 const lang = 'en-us';
 // const t = useTranslations(lang, '@studiocms/dashboard:index');
@@ -15,4 +16,8 @@ const lang = 'en-us';
   {lang}
   >
 
+  <div slot="header">
+    <PageHeader title="Content Management" />
+  </div>
+
 </Layout>
diff --git a/packages/studiocms_dashboard/src/routes/user-management.astro b/packages/studiocms_dashboard/src/routes/user-management.astro
index ac2163809..6c23c6d4d 100644
--- a/packages/studiocms_dashboard/src/routes/user-management.astro
+++ b/packages/studiocms_dashboard/src/routes/user-management.astro
@@ -2,6 +2,7 @@
 import { prerenderRoutes as pagePreRendered } from 'studiocms:mode';
 // import { useTranslations } from 'studiocms:i18n';
 import { Layout } from '../components';
+import PageHeader from '../components/PageHeader.astro';
 
 const lang = 'en-us';
 // const t = useTranslations(lang, '@studiocms/dashboard:index');
@@ -13,5 +14,8 @@ const lang = 'en-us';
   {lang}
   >
 
+  <div slot="header">
+    <PageHeader title="User Management" />
+  </div>
 
 </Layout>
