diff --git a/src/routes/admin/onboarding-schemas/new.tsx b/src/routes/admin/onboarding-schemas/new.tsx
index 0b7d4e5..e31de4c 100644
--- a/src/routes/admin/onboarding-schemas/new.tsx
+++ b/src/routes/admin/onboarding-schemas/new.tsx
@@ -1,4 +1,4 @@
-import { useNavigate } from '@solidjs/router';
+import { A, useNavigate } from '@solidjs/router';
 import { createMemo, createSignal, For, Show } from 'solid-js';
 import AdminShell from '~/components/AdminShell';
 
@@ -103,12 +103,18 @@ export default function CreateOnboardingFlowPage() {
 
   return (
     <AdminShell>
-      <div class="page-actions">
+      <nav class="admin-link-tabs" aria-label="Onboarding Management Navigation">
+        <A class="admin-link-tab active" href="/admin/onboarding-schemas">Onboarding Schemas</A>
+        <A class="admin-link-tab" href="/admin/runtime-roles">External Runtime Roles</A>
+        <A class="admin-link-tab" href="/admin/roles">Internal Roles</A>
+      </nav>
+
+      <div class="page-hero-card page-actions">
         <div>
           <h1 class="page-title">Create Onboarding Flow</h1>
           <p class="page-subtitle">Build one onboarding flow at a time. Start with the role, add steps, then configure fields for each step.</p>
         </div>
-        <a class="btn" href="/admin/onboarding-schemas">Back to Onboarding</a>
+        <A class="btn" href="/admin/onboarding-schemas">Back to Onboarding</A>
       </div>
 
       <Show when={error()}>
diff --git a/src/routes/admin/roles/create.tsx b/src/routes/admin/roles/create.tsx
index 0334223..b06b126 100644
--- a/src/routes/admin/roles/create.tsx
+++ b/src/routes/admin/roles/create.tsx
@@ -1,4 +1,4 @@
-import { useNavigate } from '@solidjs/router';
+import { A, useNavigate } from '@solidjs/router';
 import { createMemo, createResource, createSignal, Show } from 'solid-js';
 import AdminShell from '~/components/AdminShell';
 
@@ -90,14 +90,20 @@ export default function CreateInternalRolePage() {
 
   return (
     <AdminShell>
-      <div class="page-actions">
+      <div class="page-hero-card page-actions">
         <div>
           <h1 class="page-title">Create Internal Role</h1>
           <p class="page-subtitle">Add a new internal role with module access and permissions.</p>
         </div>
-        <a class="btn" href="/admin/roles">Back to Roles</a>
+        <A class="btn" href="/admin/roles">Back to Roles</A>
       </div>
 
+      <nav class="admin-link-tabs" aria-label="Role Management Navigation">
+        <A class="admin-link-tab active" href="/admin/roles">Internal Roles</A>
+        <A class="admin-link-tab" href="/admin/runtime-roles">External Runtime Roles</A>
+        <A class="admin-link-tab" href="/admin/onboarding-schemas">Onboarding Schemas</A>
+      </nav>
+
       <Show when={error()}>
         <div class="error-box">{error()}</div>
       </Show>
diff --git a/src/routes/admin/runtime-roles/new.tsx b/src/routes/admin/runtime-roles/new.tsx
index c2615cf..13b1312 100644
--- a/src/routes/admin/runtime-roles/new.tsx
+++ b/src/routes/admin/runtime-roles/new.tsx
@@ -1,4 +1,4 @@
-import { useNavigate } from '@solidjs/router';
+import { A, useNavigate } from '@solidjs/router';
 import { createSignal, Show } from 'solid-js';
 import AdminShell from '~/components/AdminShell';
 
@@ -81,14 +81,20 @@ export default function CreateExternalRolePage() {
 
   return (
     <AdminShell>
-      <div class="page-actions">
+      <div class="page-hero-card page-actions">
         <div>
           <h1 class="page-title">Create Runtime Role</h1>
-          <p class="page-subtitle">Create an API-backed runtime role for the external workspace shell.</p>
+          <p class="page-subtitle">Create an API-backed runtime role for the external runtime shell.</p>
         </div>
-        <a class="btn" href="/admin/runtime-roles">Back to Runtime Roles</a>
+        <A class="btn" href="/admin/runtime-roles">Back to Runtime Roles</A>
       </div>
 
+      <nav class="admin-link-tabs" aria-label="External Management Navigation">
+        <A class="admin-link-tab active" href="/admin/runtime-roles">External Runtime Roles</A>
+        <A class="admin-link-tab" href="/admin/onboarding-schemas">Onboarding Schemas</A>
+        <A class="admin-link-tab" href="/admin/roles">Internal Roles</A>
+      </nav>
+
       <Show when={error()}>
         <div class="error-box">{error()}</div>
       </Show>