diff --git a/docs/benchmarks.rst b/docs/benchmarks.rst
index f11e01a..f77fabb 100644
--- a/docs/benchmarks.rst
+++ b/docs/benchmarks.rst
@@ -2,8 +2,8 @@
    :description: Validation benchmarks comparing diff-diff against R packages (did, synthdid, fixest). Coefficient accuracy, standard error comparison, and performance metrics.
    :keywords: difference-in-differences benchmark, DiD validation R, python econometrics accuracy, did package comparison
 
-Benchmarks: Validation Against R Packages
-=========================================
+Benchmarks
+==========
 
 This document presents validation benchmarks comparing diff-diff against
 established R packages for difference-in-differences analysis. As of v2.0.0,
diff --git a/docs/conf.py b/docs/conf.py
index ade3cfd..70a151c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -75,6 +75,9 @@
 sitemap_url_scheme = "{link}"
 
 html_theme_options = {
+    "logo": {
+        "text": "diff-diff",
+    },
     "icon_links": [
         {
             "name": "GitHub",
@@ -87,16 +90,9 @@
             "icon": "fa-brands fa-python",
         },
     ],
+    "navbar_end": ["theme-switcher", "navbar-icon-links"],
     "navigation_depth": 4,
     "show_toc_level": 2,
-    "use_edit_page_button": True,
-}
-
-html_context = {
-    "github_user": "igerber",
-    "github_repo": "diff-diff",
-    "github_version": "main",
-    "doc_path": "docs",
 }
 
 # -- Options for sphinxext-opengraph -----------------------------------------
diff --git a/docs/index.rst b/docs/index.rst
index 6bdc8db..0878753 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -44,17 +44,24 @@ For development:
 Quick Links
 -----------
 
+- :doc:`api/index` - Full API reference
 - :doc:`quickstart` - Get started with basic examples
 - :doc:`choosing_estimator` - Which estimator should I use?
 - :doc:`troubleshooting` - Common issues and solutions
 - :doc:`r_comparison` - Comparison with R packages
 - :doc:`python_comparison` - Comparison with Python packages
-- :doc:`benchmarks` - Performance benchmarks vs R packages
-- :doc:`api/index` - Full API reference
+- :doc:`benchmarks` - Validation benchmarks vs R
+
+.. toctree::
+   :maxdepth: 2
+   :caption: API
+   :hidden:
+
+   api/index
 
 .. toctree::
    :maxdepth: 2
-   :caption: User Guide
+   :caption: Guide
    :hidden:
 
    quickstart
@@ -64,13 +71,6 @@ Quick Links
    python_comparison
    benchmarks
 
-.. toctree::
-   :maxdepth: 2
-   :caption: API Reference
-   :hidden:
-
-   api/index
-
 .. toctree::
    :maxdepth: 1
    :caption: Tutorials
diff --git a/docs/python_comparison.rst b/docs/python_comparison.rst
index d94250e..9d18762 100644
--- a/docs/python_comparison.rst
+++ b/docs/python_comparison.rst
@@ -2,8 +2,8 @@
    :description: Compare diff-diff with other Python DiD libraries including pyfixest, causalimpact, and linearmodels. Feature matrix, API comparison, and migration guide.
    :keywords: python DiD library comparison, pyfixest vs diff-diff, causalimpact alternative, python difference-in-differences packages
 
-Comparison with Python Packages
-================================
+Python Comparison
+=================
 
 This guide compares diff-diff with other Python packages for DiD analysis,
 helping users understand the landscape and choose the right tool.
diff --git a/docs/r_comparison.rst b/docs/r_comparison.rst
index 96e61e1..f8507d2 100644
--- a/docs/r_comparison.rst
+++ b/docs/r_comparison.rst
@@ -2,8 +2,8 @@
    :description: Compare diff-diff with R packages for DiD analysis. Migration guide from R did, fixest, synthdid, and HonestDiD to Python with side-by-side code examples.
    :keywords: R did package python alternative, fixest python, synthdid python, R to python DiD, econometrics R vs python
 
-Comparison with R Packages
-==========================
+R Comparison
+============
 
 This guide compares diff-diff with popular R packages for DiD analysis, helping
 users familiar with R transition to Python.