diff --git a/docforge/cli/main.py b/docforge/cli/main.py
index 06263e5..d72363d 100644
--- a/docforge/cli/main.py
+++ b/docforge/cli/main.py
@@ -133,6 +133,12 @@ def serve(mkdocs_yml: Path) -> None:
         raise click.ClickException(f"mkdocs.yml not found: {mkdocs_yml}")
 
     from mkdocs.commands.serve import serve as mkdocs_serve
+
+    host = "127.0.0.1"
+    port = 8000
+    url = f"http://{host}:{port}/"
+
+    click.echo(f"Serving documentation at {url}")
     mkdocs_serve(config_file=str(mkdocs_yml))
 
 
diff --git a/docforge/cli/mkdocs.py b/docforge/cli/mkdocs.py
index b0526e4..88529c1 100644
--- a/docforge/cli/mkdocs.py
+++ b/docforge/cli/mkdocs.py
@@ -25,6 +25,11 @@ def _load_template(template: Path | None) -> dict:
 
 
 @click.command("mkdocs")
+@click.option(
+    "--site-name",
+    required=True,
+    help="MkDocs site_name (required)",
+)
 @click.option(
     "--docs-dir",
     type=click.Path(path_type=Path),
@@ -52,6 +57,7 @@ def mkdocs_cmd(
     nav_file: Path,
     template: Path | None,
     out: Path,
+    site_name: str,
 ) -> None:
     """Generate mkdocs.yml from nav spec and template."""
 
@@ -70,6 +76,9 @@ def mkdocs_cmd(
     # Load template (user or built-in)
     data = _load_template(template)
 
+    # Inject site_name
+    data["site_name"] = site_name
+
     # Inject nav
     data["nav"] = nav_block
 
diff --git a/docforge/cli/mkdocs.pyi b/docforge/cli/mkdocs.pyi
index fab4667..3121f5d 100644
--- a/docforge/cli/mkdocs.pyi
+++ b/docforge/cli/mkdocs.pyi
@@ -9,6 +9,11 @@ def _load_template(template: Optional[Path]) -> Dict[str, Any]:
 
 
 @click.command("mkdocs")
+@click.option(
+    "--site-name",
+    required=True,
+    help="MkDocs site_name (required)",
+)
 @click.option(
     "--docs-dir",
     type=click.Path(path_type=Path),
@@ -35,5 +40,6 @@ def mkdocs_cmd(
     nav_file: Path,
     template: Optional[Path],
     out: Path,
+    site_name: str,
 ) -> None:
     ...
diff --git a/docforge/nav/mkdocs.py b/docforge/nav/mkdocs.py
index 40f4468..c1d516c 100644
--- a/docforge/nav/mkdocs.py
+++ b/docforge/nav/mkdocs.py
@@ -19,14 +19,27 @@ class MkDocsNavEmitter:
             entries: List[str] = []
             for p in paths:
                 # Convert filesystem path back to docs-relative path
-                entries.append(self._to_relative(p))
+                rel_path = self._to_relative(p, nav._docs_root)
+                entries.append(rel_path)
             result.append({group: entries})
 
         return result
 
-    def _to_relative(self, path: Path) -> str:
+    def _to_relative(self, path: Path, docs_root: Path | None) -> str:
         """
         Convert a filesystem path to a docs-relative path.
         """
-        # Normalize to POSIX-style for MkDocs
+        if docs_root and path.is_absolute():
+            try:
+                path = path.relative_to(docs_root.resolve())
+            except ValueError:
+                pass
+        elif docs_root:
+            # Handle relative paths (e.g. starting with 'docs/')
+            path_str = path.as_posix()
+            docs_root_str = docs_root.as_posix()
+            if path_str.startswith(docs_root_str + "/"):
+                return path_str[len(docs_root_str) + 1:]
+        
+        # Fallback for other cases
         return path.as_posix().split("/docs/", 1)[-1]
diff --git a/pyproject.toml b/pyproject.toml
index e0061be..433945c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -42,8 +42,15 @@ doc-forge = "docforge.cli.main:main"
 
 [project.optional-dependencies]
 mkdocs = [
-    "mkdocs>=1.5.0",
-    "mkdocstrings[python]>=0.20.0",
+    "mkdocs==1.6.1",
+    "mkdocs-material==9.6.23",
+
+    "mkdocstrings==0.25.2",
+    "mkdocstrings-python==1.10.8",
+    "mkdocs-autorefs==0.5.0",
+
+    "pymdown-extensions==10.16.1",
+    "neoteroi-mkdocs==1.1.3",
 ]
 sphinx = [
     "sphinx>=5.0.0",