diff --git a/src/routes/admin/employees.tsx b/src/routes/admin/employees.tsx
index 80fee41..03666be 100644
--- a/src/routes/admin/employees.tsx
+++ b/src/routes/admin/employees.tsx
@@ -58,7 +58,11 @@ function isActive(e: Employee): boolean {
   return s === 'ACTIVE' || s === 'TRUE' || s === '1';
 }
 
-export default function EmployeesPage() {
+type EmployeesPageProps = {
+  initialView?: 'list' | 'create';
+};
+
+export default function EmployeesPage(props: EmployeesPageProps = {}) {
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
 
@@ -66,7 +70,7 @@ export default function EmployeesPage() {
   const [roles] = createResource(loadRoles);
 
   // tabs: list | create
-  const [view, setView] = createSignal<'list' | 'create'>('list');
+  const [view, setView] = createSignal<'list' | 'create'>(props.initialView || 'list');
 
   onMount(() => {
     if (searchParams.tab === 'create') {
diff --git a/src/routes/admin/employees/create.tsx b/src/routes/admin/employees/create.tsx
index e042261..cca7af6 100644
--- a/src/routes/admin/employees/create.tsx
+++ b/src/routes/admin/employees/create.tsx
@@ -1,19 +1,5 @@
-import { onMount } from 'solid-js';
-import { useNavigate } from '@solidjs/router';
-import AdminShell from '~/components/AdminShell';
+import EmployeesPage from '~/routes/admin/employees';
 
-export default function CreateEmployeeAliasPage() {
-  const navigate = useNavigate();
-
-  onMount(() => {
-    navigate('/admin/employees?tab=create', { replace: true });
-  });
-
-  return (
-    <AdminShell>
-      <div class="card">
-        <p class="notice">Redirecting to employee create form...</p>
-      </div>
-    </AdminShell>
-  );
+export default function CreateEmployeePage() {
+  return <EmployeesPage initialView="create" />;
 }
diff --git a/src/routes/admin/kb.tsx b/src/routes/admin/kb.tsx
index 48ee1de..23a0273 100644
--- a/src/routes/admin/kb.tsx
+++ b/src/routes/admin/kb.tsx
@@ -45,8 +45,12 @@ async function loadArticles(): Promise<KbArticle[]> {
   }
 }
 
-export default function KbPage() {
-  const [tab, setTab] = createSignal<'categories' | 'articles' | 'create-article'>('categories');
+type KbPageProps = {
+  initialTab?: 'categories' | 'articles' | 'create-article';
+};
+
+export default function KbPage(props: KbPageProps = {}) {
+  const [tab, setTab] = createSignal<'categories' | 'articles' | 'create-article'>(props.initialTab || 'categories');
 
   // Categories resource
   const [categories, { refetch: refetchCategories }] = createResource(loadCategories);
diff --git a/src/routes/admin/kb/articles.tsx b/src/routes/admin/kb/articles.tsx
index d2195ad..b17b7cd 100644
--- a/src/routes/admin/kb/articles.tsx
+++ b/src/routes/admin/kb/articles.tsx
@@ -1,9 +1,5 @@
-import { onMount } from 'solid-js';
-import { useNavigate } from '@solidjs/router';
-import AdminShell from '~/components/AdminShell';
+import KbPage from '~/routes/admin/kb';
 
-export default function KbArticlesAliasPage() {
-  const navigate = useNavigate();
-  onMount(() => navigate('/admin/kb', { replace: true }));
-  return <AdminShell><div class="card"><p class="notice">Redirecting to knowledge base...</p></div></AdminShell>;
+export default function KbArticlesPage() {
+  return <KbPage initialTab="articles" />;
 }
diff --git a/src/routes/admin/kb/articles/[id].tsx b/src/routes/admin/kb/articles/[id].tsx
index 18b61c3..1cc37ce 100644
--- a/src/routes/admin/kb/articles/[id].tsx
+++ b/src/routes/admin/kb/articles/[id].tsx
@@ -1,17 +1,77 @@
-import { onMount } from 'solid-js';
-import { A, useNavigate, useParams } from '@solidjs/router';
+import { A, useParams } from '@solidjs/router';
+import { createResource, Show } from 'solid-js';
 import AdminShell from '~/components/AdminShell';
 
-export default function KbArticleAliasPage() {
-  const navigate = useNavigate();
+const API = '/api/gateway';
+
+type KbArticle = {
+  id: string;
+  title: string;
+  slug?: string;
+  content?: string;
+  body?: string;
+  status?: string;
+  category?: string;
+  category_id?: string;
+  updated_at?: string;
+  created_at?: string;
+};
+
+async function loadArticle(id: string): Promise<KbArticle | null> {
+  try {
+    const res = await fetch(`${API}/api/admin/kb/articles/${id}`);
+    if (!res.ok) return null;
+    return res.json();
+  } catch {
+    return null;
+  }
+}
+
+export default function KbArticleDetailPage() {
   const params = useParams();
-  onMount(() => navigate('/admin/kb', { replace: true }));
+  const [article] = createResource(() => params.id, loadArticle);
+
   return (
     <AdminShell>
-      <div class="card">
-        <p class="notice">Redirecting article <strong>{params.id}</strong> to knowledge base module...</p>
-        <div class="actions"><A class="btn" href="/admin/kb">Open Knowledge Base</A></div>
+      <div class="page-hero-card page-actions">
+        <div>
+          <h1 class="page-title">KB Article Detail</h1>
+          <p class="page-subtitle">Metadata and safe content preview for this article.</p>
+        </div>
+        <div class="page-actions-right">
+          <A class="btn" href="/admin/kb/articles">Back to Articles</A>
+          <A class="btn primary" href={`/admin/kb/articles/${params.id}/edit`}>Edit Article</A>
+        </div>
       </div>
+
+      <Show when={article.loading}>
+        <section class="card"><p class="notice">Loading article...</p></section>
+      </Show>
+
+      <Show when={!article.loading && !article()}>
+        <section class="card"><p class="notice">Article not found.</p></section>
+      </Show>
+
+      <Show when={article()}>
+        <div class="detail-layout">
+          <section class="card">
+            <h2 style="margin-bottom:10px">Metadata</h2>
+            <div class="field-grid-2">
+              <div class="kv-item"><p class="kv-label">Title</p><p class="kv-value">{article()!.title || '—'}</p></div>
+              <div class="kv-item"><p class="kv-label">Status</p><p class="kv-value">{article()!.status || '—'}</p></div>
+              <div class="kv-item"><p class="kv-label">Slug</p><p class="kv-value">{article()!.slug || '—'}</p></div>
+              <div class="kv-item"><p class="kv-label">Category</p><p class="kv-value">{article()!.category || article()!.category_id || '—'}</p></div>
+              <div class="kv-item"><p class="kv-label">Created At</p><p class="kv-value">{article()!.created_at ? new Date(article()!.created_at!).toLocaleString() : '—'}</p></div>
+              <div class="kv-item"><p class="kv-label">Updated At</p><p class="kv-value">{article()!.updated_at ? new Date(article()!.updated_at!).toLocaleString() : '—'}</p></div>
+            </div>
+          </section>
+
+          <section class="card">
+            <h2 style="margin-bottom:10px">Content</h2>
+            <pre class="json" style="max-height:720px;white-space:pre-wrap">{article()!.content || article()!.body || 'No content'}</pre>
+          </section>
+        </div>
+      </Show>
     </AdminShell>
   );
 }
diff --git a/src/routes/admin/kb/articles/[id]/edit.tsx b/src/routes/admin/kb/articles/[id]/edit.tsx
index ad7dc5e..d2bbb05 100644
--- a/src/routes/admin/kb/articles/[id]/edit.tsx
+++ b/src/routes/admin/kb/articles/[id]/edit.tsx
@@ -1,17 +1,138 @@
-import { onMount } from 'solid-js';
 import { A, useNavigate, useParams } from '@solidjs/router';
+import { createEffect, createResource, createSignal, Show } from 'solid-js';
 import AdminShell from '~/components/AdminShell';
 
-export default function KbArticleEditAliasPage() {
+const API = '/api/gateway';
+
+type KbArticle = {
+  id: string;
+  title: string;
+  slug?: string;
+  content?: string;
+  body?: string;
+  status?: string;
+  category_id?: string;
+};
+
+async function loadArticle(id: string): Promise<KbArticle | null> {
+  try {
+    const res = await fetch(`${API}/api/admin/kb/articles/${id}`);
+    if (!res.ok) return null;
+    return res.json();
+  } catch {
+    return null;
+  }
+}
+
+export default function KbArticleEditPage() {
   const navigate = useNavigate();
   const params = useParams();
-  onMount(() => navigate('/admin/kb', { replace: true }));
+  const [article] = createResource(() => params.id, loadArticle);
+  const [title, setTitle] = createSignal('');
+  const [slug, setSlug] = createSignal('');
+  const [categoryId, setCategoryId] = createSignal('');
+  const [status, setStatus] = createSignal('DRAFT');
+  const [content, setContent] = createSignal('');
+  const [saving, setSaving] = createSignal(false);
+  const [error, setError] = createSignal('');
+  const [loaded, setLoaded] = createSignal(false);
+
+  createEffect(() => {
+    const value = article();
+    if (!value || loaded()) return;
+    setTitle(value.title || '');
+    setSlug(value.slug || '');
+    setCategoryId(value.category_id || '');
+    setStatus(value.status || 'DRAFT');
+    setContent(value.content || value.body || '');
+    setLoaded(true);
+  });
+
+  const save = async (e: Event) => {
+    e.preventDefault();
+    try {
+      setSaving(true);
+      setError('');
+      const res = await fetch(`${API}/api/admin/kb/articles/${params.id}`, {
+        method: 'PATCH',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          title: title(),
+          slug: slug(),
+          category_id: categoryId() || null,
+          status: status(),
+          content: content(),
+        }),
+      });
+      if (!res.ok) throw new Error('Failed to save article');
+      navigate(`/admin/kb/articles/${params.id}`);
+    } catch (err: any) {
+      setError(err.message || 'Failed to save article');
+    } finally {
+      setSaving(false);
+    }
+  };
+
   return (
     <AdminShell>
-      <div class="card">
-        <p class="notice">Redirecting article edit <strong>{params.id}</strong> to knowledge base module...</p>
-        <div class="actions"><A class="btn" href="/admin/kb">Open Knowledge Base</A></div>
+      <div class="page-hero-card page-actions">
+        <div>
+          <h1 class="page-title">Edit KB Article</h1>
+          <p class="page-subtitle">Update article metadata, status, and content.</p>
+        </div>
+        <div class="page-actions-right">
+          <A class="btn" href={`/admin/kb/articles/${params.id}`}>Back to Detail</A>
+          <A class="btn" href="/admin/kb/articles">Back to Articles</A>
+        </div>
       </div>
+
+      <Show when={article.loading}>
+        <section class="card"><p class="notice">Loading article...</p></section>
+      </Show>
+
+      <Show when={!article.loading && !article()}>
+        <section class="card"><p class="notice">Article not found.</p></section>
+      </Show>
+
+      <Show when={article() && loaded()}>
+        <form class="card" onSubmit={save}>
+          <div class="field-grid-2">
+            <div class="field">
+              <label>Title</label>
+              <input value={title()} onInput={(e) => setTitle(e.currentTarget.value)} required />
+            </div>
+            <div class="field">
+              <label>Slug</label>
+              <input value={slug()} onInput={(e) => setSlug(e.currentTarget.value)} />
+            </div>
+            <div class="field">
+              <label>Category ID</label>
+              <input value={categoryId()} onInput={(e) => setCategoryId(e.currentTarget.value)} />
+            </div>
+            <div class="field">
+              <label>Status</label>
+              <select value={status()} onChange={(e) => setStatus(e.currentTarget.value)}>
+                <option value="DRAFT">DRAFT</option>
+                <option value="PUBLISHED">PUBLISHED</option>
+              </select>
+            </div>
+            <div class="field" style="grid-column:1 / -1">
+              <label>Content</label>
+              <textarea rows="16" value={content()} onInput={(e) => setContent(e.currentTarget.value)} />
+            </div>
+          </div>
+
+          <Show when={error()}>
+            <p class="error-note">{error()}</p>
+          </Show>
+
+          <div class="actions" style="justify-content:flex-end">
+            <button class="btn primary" type="submit" disabled={saving()}>
+              {saving() ? 'Saving...' : 'Save Article'}
+            </button>
+          </div>
+        </form>
+      </Show>
     </AdminShell>
   );
 }
diff --git a/src/routes/admin/kb/articles/new.tsx b/src/routes/admin/kb/articles/new.tsx
index 80a99b5..16f998f 100644
--- a/src/routes/admin/kb/articles/new.tsx
+++ b/src/routes/admin/kb/articles/new.tsx
@@ -1,9 +1,5 @@
-import { onMount } from 'solid-js';
-import { useNavigate } from '@solidjs/router';
-import AdminShell from '~/components/AdminShell';
+import KbPage from '~/routes/admin/kb';
 
-export default function KbArticleNewAliasPage() {
-  const navigate = useNavigate();
-  onMount(() => navigate('/admin/kb', { replace: true }));
-  return <AdminShell><div class="card"><p class="notice">Redirecting to knowledge base editor...</p></div></AdminShell>;
+export default function KbArticleNewPage() {
+  return <KbPage initialTab="create-article" />;
 }
diff --git a/src/routes/admin/kb/categories.tsx b/src/routes/admin/kb/categories.tsx
index d61d9c5..215de42 100644
--- a/src/routes/admin/kb/categories.tsx
+++ b/src/routes/admin/kb/categories.tsx
@@ -1,9 +1,5 @@
-import { onMount } from 'solid-js';
-import { useNavigate } from '@solidjs/router';
-import AdminShell from '~/components/AdminShell';
+import KbPage from '~/routes/admin/kb';
 
-export default function KbCategoriesAliasPage() {
-  const navigate = useNavigate();
-  onMount(() => navigate('/admin/kb', { replace: true }));
-  return <AdminShell><div class="card"><p class="notice">Redirecting to knowledge base categories...</p></div></AdminShell>;
+export default function KbCategoriesPage() {
+  return <KbPage initialTab="categories" />;
 }