diff --git a/.github/workflows/build-gh-pages.yml b/.github/workflows/build-gh-pages.yml
index 3935504ce..fbebbe15a 100644
--- a/.github/workflows/build-gh-pages.yml
+++ b/.github/workflows/build-gh-pages.yml
@@ -1,5 +1,6 @@
 name: deploy-book
 
+# Run when pushing to main or translation branches
 on:
   push:
     branches:
@@ -12,6 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  # Get language and version info
   get-info:
     runs-on: ubuntu-latest
     outputs:
@@ -21,12 +23,14 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      # Read languages from JSON file
       - name: Get languages directly with jq
         id: get-languages
         run: |
           languages=$(jq -c '[.[] | .code]' DISCOVER/_static/languages.json)
           echo "languages=${languages}" >> "$GITHUB_OUTPUT"
       
+      # Determine version based on ref type and name
       - name: Determine version from GitHub context
         id: version-info
         env:
@@ -40,12 +44,13 @@ jobs:
             version="${REF_NAME%-translations}"
           fi
           echo "version=$version" >> "$GITHUB_OUTPUT"
-
+  
+  # Build docs for each language
   deploy-book:
     needs: get-info
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 1
+      max-parallel: 1 # Build one at a time
       matrix:
         language: ${{ fromJSON(needs.get-info.outputs.languages) }}
     steps:
@@ -59,6 +64,7 @@ jobs:
         with:
           python-version: '3.13'
 
+      # Build the documentation
       - name: Build documentation with script
         env:
           VERSION: ${{ needs.get-info.outputs.version }}
@@ -66,6 +72,7 @@ jobs:
         run: |
           bash ci/build_website.sh
 
+      # Deploy the built documentation
       - name: Deploy language to GitHub Pages
         uses: peaceiris/actions-gh-pages@v4
         with:
@@ -74,6 +81,7 @@ jobs:
           destination_dir: ${{ needs.get-info.outputs.version }}/${{ matrix.language }}
           keep_files: true
 
+  # Create redirect for version
   create-redirect:
     needs: [get-info, deploy-book] 
     runs-on: ubuntu-latest
@@ -105,6 +113,7 @@ jobs:
           destination_dir: ${{ needs.get-info.outputs.version }}
           keep_files: true
 
+  # Deploy files to root (main branch only)
   deploy-root-files:
     needs: [create-redirect]
     runs-on: ubuntu-latest
@@ -113,12 +122,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      # Copy important files to root
       - name: Create root files directory
         run: |
           mkdir -p root_files
-          cp DISCOVER/404.html root_files/
-          cp index.html root_files/
-          cp DISCOVER/_static/versions.json root_files/
+          cp DISCOVER/404.html root_files/  # Error page
+          cp index.html root_files/         # Landing page
+          cp DISCOVER/_static/versions.json root_files/  # Versions list
 
       - name: Deploy root files to GitHub Pages
         uses: peaceiris/actions-gh-pages@v4
diff --git a/DISCOVER/_static/css/Switchers.css b/DISCOVER/_static/css/Switchers.css
new file mode 100644
index 000000000..0256490f3
--- /dev/null
+++ b/DISCOVER/_static/css/Switchers.css
@@ -0,0 +1,131 @@
+/* Version switcher and language switcher */
+.version-switcher__button,
+#language-switcher-button {
+  font-size: 1rem !important;
+  color: #495057 !important;
+  border: 1px solid #dee2e6 !important;
+}
+
+.version-switcher__button:hover,
+#language-switcher-button:hover,
+.version-switcher__button:focus,
+#language-switcher-button:focus {
+  background-color: #f8f9fa !important;
+  border-color: transparent !important;
+  box-shadow: 0 0 0 0.1875rem #e89217 !important;
+}
+
+.version-switcher__button:hover,
+#language-switcher-button:hover {
+  color: #222832 !important;
+}
+
+.version-switcher__button:focus,
+#language-switcher-button:focus {
+  outline: none !important;
+}
+
+.version-switcher__button::after,
+#language-switcher-button::after {
+  content: "" !important;
+  display: inline-block !important;
+  margin-left: 0.5rem !important;
+  vertical-align: 0.125em !important;
+  border: 0.3em solid transparent !important;
+  border-top-color: #495057 !important;
+  border-bottom-width: 0 !important;
+}
+
+.version-switcher__button:hover::after,
+#language-switcher-button:hover::after {
+  border-top-color: #222832 !important;
+}
+
+.version-switcher__button .caret,
+.version-switcher__button::before {
+  display: none !important;
+}
+
+.version-switcher__menu .list-group-item:hover,
+.dropdown-item:hover {
+  background-color: #f8f9fa !important;
+  color:  #e89217 !important;
+  text-decoration: underline !important;
+  text-decoration-thickness: 0.15rem !important;
+}
+
+.dropdown-item.active {
+  color: #528fe4 !important;
+  background-color: #ffffff !important;
+  box-shadow: inset 3px 0 0 #528fe4 !important;
+}
+
+.dropdown-menu > li:not(:last-child) {
+  border-bottom: 1px solid #dee2e6 !important;
+}
+
+.dropdown-item.active:hover {
+  background-color: #f8f9fa !important;
+  color: #e89217 !important;
+}
+
+
+html[data-theme=dark] .version-switcher__button,
+html[data-theme=dark] #language-switcher-button {
+  color: #9ca4af !important;
+  background-color: #121212 !important;
+  border-color: #48566b !important;
+}
+
+html[data-theme=dark] .version-switcher__button:hover,
+html[data-theme=dark] #language-switcher-button:hover,
+html[data-theme=dark] .version-switcher__button:focus,
+html[data-theme=dark] #language-switcher-button:focus{
+  color: #ced6dd !important;
+  border-color: transparent !important;
+}
+
+html[data-theme=dark] .version-switcher__button:focus,
+html[data-theme=dark] #language-switcher-button:focus{
+  outline: none !important;
+}
+
+html[data-theme=dark] .version-switcher__button::after,
+html[data-theme=dark] #language-switcher-button::after {
+  border-top-color: #9ca4af !important;
+}
+
+html[data-theme=dark] .version-switcher__button:hover::after,
+html[data-theme=dark] #language-switcher-button:hover::after {
+  border-top-color: #ced6dd !important;
+}
+
+html[data-theme=dark] .version-switcher__menu,
+html[data-theme=dark] .version-switcher__menu .list-group-item {
+  background-color: #121212 !important;
+}
+
+html[data-theme=dark] .version-switcher__menu .list-group-item:hover,
+html[data-theme=dark] .dropdown-item:hover {
+  background-color: #0D0D0D !important;
+  color:  #e89217 !important;
+  text-decoration: underline !important;
+  text-decoration-thickness: 0.15rem !important;
+}
+
+html[data-theme=dark] .dropdown-item.active {
+  background-color: #121212 !important;
+}
+
+html[data-theme=dark] .dropdown-item.active:hover {
+  background-color: #0D0D0D !important;
+}
+
+.bd-header-article .version-switcher__button,
+.bd-header-article #language-switcher-button {
+  margin: 0 !important;
+}
+
+html[data-theme=dark] .dropdown-menu > li:not(:last-child) {
+  border-bottom: 1px solid #48566b !important;
+}
diff --git a/DISCOVER/_static/css/mainLogo.css b/DISCOVER/_static/css/mainLogo.css
index 0a47a755e..abd09480a 100644
--- a/DISCOVER/_static/css/mainLogo.css
+++ b/DISCOVER/_static/css/mainLogo.css
@@ -119,110 +119,3 @@ html[data-theme=dark] .social-links a:hover {
     margin: 1rem 0 0 0;
   }
 }
-
-/* Version switcher and language switcher */
-.version-switcher__button,
-#language-switcher-button {
-  font-size: 1rem !important;
-  color: #495057 !important;
-  border: 1px solid #dee2e6 !important;
-}
-
-.version-switcher__button:hover,
-#language-switcher-button:hover,
-.version-switcher__button:focus,
-#language-switcher-button:focus {
-  background-color: #f8f9fa !important;
-  border-color: transparent !important;
-  box-shadow: 0 0 0 0.1875rem #e89217 !important;
-}
-
-.version-switcher__button:hover,
-#language-switcher-button:hover {
-  color: #222832 !important;
-}
-
-.version-switcher__button:focus,
-#language-switcher-button:focus {
-  outline: none !important;
-}
-
-.version-switcher__button::after,
-#language-switcher-button::after {
-  content: "" !important;
-  display: inline-block !important;
-  margin-left: 0.5rem !important;
-  vertical-align: 0.125em !important;
-  border: 0.3em solid transparent !important;
-  border-top-color: #495057 !important;
-  border-bottom-width: 0 !important;
-}
-
-.version-switcher__button:hover::after,
-#language-switcher-button:hover::after {
-  border-top-color: #222832 !important;
-}
-
-.version-switcher__button .caret,
-.version-switcher__button::before {
-  display: none !important;
-}
-
-.version-switcher__menu .list-group-item:hover,
-.dropdown-item:hover {
-  background-color: #f8f9fa !important;
-}
-
-.dropdown-item.active {
-  color: #528fe4 !important;
-  background-color: #ffffff !important;
-  box-shadow: inset 3px 0 0 #528fe4 !important;
-  border-bottom: 1px solid #dee2e6 !important;
-}
-
-html[data-theme=dark] .version-switcher__button,
-html[data-theme=dark] #language-switcher-button {
-  color: #9ca4af !important;
-  background-color: #121212 !important;
-  border-color: #48566b !important;
-}
-
-html[data-theme=dark] .version-switcher__button:hover,
-html[data-theme=dark] #language-switcher-button:hover {
-  color: #ced6dd !important;
-}
-
-html[data-theme=dark] .version-switcher__button::after,
-html[data-theme=dark] #language-switcher-button::after {
-  border-top-color: #9ca4af !important;
-}
-
-html[data-theme=dark] .version-switcher__button:hover::after,
-html[data-theme=dark] #language-switcher-button:hover::after {
-  border-top-color: #ced6dd !important;
-}
-
-html[data-theme=dark] .version-switcher__menu,
-html[data-theme=dark] .version-switcher__menu .list-group-item {
-  background-color: #121212 !important;
-}
-
-html[data-theme=dark] .version-switcher__menu .list-group-item:hover,
-html[data-theme=dark] .dropdown-item:hover {
-  background-color: #000000 !important;
-}
-
-html[data-theme=dark] .dropdown-item.active {
-  background-color: #121212 !important;
-  border-bottom-color: #48566b !important;
-}
-
-html[data-theme=dark] .dropdown-item.active:hover {
-  color: #ced6dd !important;
-  background-color: #121212 !important;
-}
-
-.bd-header-article .version-switcher__button,
-.bd-header-article #language-switcher-button {
-  margin: 0 !important;
-}
diff --git a/DISCOVER/_templates/language-switcher.html b/DISCOVER/_templates/language-switcher.html
index 44b5726fb..c0b5fa98e 100644
--- a/DISCOVER/_templates/language-switcher.html
+++ b/DISCOVER/_templates/language-switcher.html
@@ -6,7 +6,7 @@
   <ul class="dropdown-menu" aria-labelledby="language-switcher-button">
     {% for item in languages %}
         <li>
-          <a class="dropdown-item{% if current_language == item.code %}active{% endif %}" 
+          <a class="dropdown-item{% if current_language == item.code %} active{% endif %}" 
             href="{{ baseurl }}/{{ current_version }}/{{ item.code }}/{{ pagename }}.html"
             {% if item.direction %}dir="{{ item.direction }}"{% endif %}>
             {{ item.name_local }}
diff --git a/DISCOVER/conf.py b/DISCOVER/conf.py
index e9dd15d04..c3932e054 100644
--- a/DISCOVER/conf.py
+++ b/DISCOVER/conf.py
@@ -1,7 +1,9 @@
 import json
 import os
 
+# Get version and language from environment variables
 version = os.environ.get("WEBSITE_VERSION", "dev")
+release = version
 language = os.environ.get("WEBSITE_LANGUAGE", "en")
 
 baseurl = 'https://discover-cookbook.numfocus.org'
@@ -50,7 +52,7 @@
 external_toc_exclude_missing = False
 external_toc_path = '_toc.yml'
 html_baseurl = ''
-html_css_files = ['css/mainLogo.css']
+html_css_files = ['css/mainLogo.css','css/Switchers.css']
 html_favicon = ''
 html_js_files = ['js/footer.js', 'js/logo-switcher.js']
 html_logo = '_static/images/logo-light.png'
@@ -72,10 +74,12 @@
     'use_edit_page_button': False, 
     'use_issues_button': True,
     
-    
+    # Header layout
     "article_header_start": ["toggle-primary-sidebar","version-switcher","language-switcher"],
     "navigation_with_keys": False,
     "show_version_warning_banner": True,
+
+    # Version switcher config
     "switcher": {
         "json_url": "https://discover-cookbook.numfocus.org/versions.json", 
         "version_match": version,
diff --git a/ci/build_website.sh b/ci/build_website.sh
index e72f1266b..665e1fb1f 100644
--- a/ci/build_website.sh
+++ b/ci/build_website.sh
@@ -13,6 +13,6 @@ pip install -r requirements.txt
 # Clean tags directory
 rm -rf DISCOVER/_tags/*
 
-
+# Build the documentation
 echo "Building $LANGUAGE version..."
 WEBSITE_VERSION="$VERSION" WEBSITE_LANGUAGE="$LANGUAGE" sphinx-build -b html DISCOVER/ DISCOVER/_build/html
diff --git a/index.html b/index.html
index 61d5ca1e7..865919c67 100644
--- a/index.html
+++ b/index.html
@@ -1,12 +1,17 @@
 <!DOCTYPE html>
 <html lang="en" data-bs-theme="dark">
 <head>
+    <!-- Meta tags and title -->
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>DISCOVER Cookbook</title>
+
+    <!-- External CSS libraries -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-LN+7fdVzj6u52u30Kp6M/trliBMCMKTyK833zpbD+pXdCLuTusPj697FH4R/5mcr" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.13.1/font/bootstrap-icons.min.css">
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
+
+    <!-- Custom styles -->
     <style>
         body { font-family: 'Inter', sans-serif; }
         [data-bs-theme="dark"] {
@@ -20,9 +25,11 @@
     </style>
 </head>
 <body>
+    <!-- Navigation bar -->
     <nav class="navbar navbar-expand-lg sticky-top border-bottom">
         <div class="container">
-            <a class="navbar-brand fw-bold" href="#home">
+            <!-- Main Logo -->
+            <a class="navbar-brand fw-bold" href="#">
                 <img src="_static/images/logo-dark.png" alt="DISCOVER Cookbook" height="75" class="me-2 theme-logo dark-logo">
                 <img src="_static/images/logo-light.png" alt="DISCOVER Cookbook" height="75" class="me-2 theme-logo light-logo d-none">
             </a>
@@ -32,10 +39,8 @@
                     <li class="nav-item"><a class="nav-link" href="#about">About</a></li>
                     <li class="nav-item"><a class="nav-link" href="#versions">Versions</a></li>
                     <li class="nav-item"><a class="nav-link" href="#contribute">Contribute</a></li>
-                    <li class="nav-item ms-lg-3">
+                    <li class="nav-item d-flex gap-2 ms-lg-3">
                         <a href="https://github.com/numfocus/DISCOVER-Cookbook" class="btn btn-outline-secondary py-1 px-2 rounded-3" title="GitHub Repository"><i class="bi bi-github"></i></a>
-                    </li>
-                    <li class="nav-item ms-lg-3">
                         <button class="btn btn-outline-secondary py-1 px-2 rounded-3" id="theme-switcher" title="Toggle theme">
                             <i class="bi bi-sun-fill d-none" id="light-icon"></i>
                             <i class="bi bi-moon-stars-fill" id="dark-icon"></i>
@@ -45,15 +50,19 @@
             </div>
         </div>
     </nav>
+
+    <!-- Main content -->
     <div class="container py-5">
         <div class="text-center py-5 mb-5">
             <h1 class="display-4 fw-bold mb-3">Welcome to <span class="text-success">DISCOVER</span> Cookbook</h1>
             <p class="lead text-muted mb-4 mx-auto" style="max-width: 600px;">Your comprehensive guide to creating diverse, inclusive, and accessible conferences and events in the tech sector</p>
             <div class="d-flex flex-wrap justify-content-center gap-3">
-                <a href="https://discover-cookbook.numfocus.org/2.0/en" class="btn btn-success btn-lg"><i class="bi bi-book"></i> Read the Cookbook</a>
+                <a href="https://discover-cookbook.numfocus.org/2.0/en/" class="btn btn-success btn-lg"><i class="bi bi-book"></i> Read the Cookbook</a>
                 <a href="#contribute" class="btn btn-outline-secondary btn-lg"><i class="bi bi-people"></i> Contribute</a>
             </div>
         </div>
+
+        <!-- About section -->
         <section id="about" class="mb-5">
             <div class="card border">
                 <div class="card-body p-4">
@@ -63,6 +72,8 @@ <h2 class="h3 mb-3">About the Cookbook</h2>
                 </div>
             </div>
         </section>
+
+        <!-- How to use this Cookbook section -->
         <section class="mb-5">
             <div class="card border">
                 <div class="card-body p-4">
@@ -73,6 +84,8 @@ <h2 class="h3 mb-3">How to Use This Cookbook</h2>
                 </div>
             </div>
         </section>
+
+         <!-- Versions section -->
         <section id="versions" class="mb-5">
             <div class="card border">
                 <div class="card-body p-4">
@@ -87,8 +100,8 @@ <h4 class="mb-0">Version 2.0</h4>
                                 </div>
                                 <p class="text-muted mb-3">The current stable release, recommended for all users. Includes the latest best practices and comprehensive updates.</p>
                                 <div class="d-flex flex-wrap gap-2">
-                                    <a href="https://discover-cookbook.numfocus.org/2.0/en" class="btn btn-success btn-sm">English</a>
-                                    <a href="https://discover-cookbook.numfocus.org/2.0/es" class="btn btn-outline-secondary btn-sm">Español</a>
+                                    <a href="https://discover-cookbook.numfocus.org/2.0/en/" class="btn btn-success btn-sm">English</a>
+                                    <a href="https://discover-cookbook.numfocus.org/2.0/es/" class="btn btn-outline-secondary btn-sm">Español</a>
                                 </div>
                             </div>
                         </div>
@@ -99,13 +112,15 @@ <h4 class="mb-0">Version 2.0</h4>
                                     <h4 class="mb-0">Version 1.0</h4>
                                 </div>
                                 <p class="text-muted mb-3">Archived for historical context and for users referencing earlier guidelines.</p>
-                                <a href="https://discover-cookbook.github.io/" class="btn btn-outline-secondary btn-sm">English</a>
+                                <a href="https://discover-cookbook.numfocus.org/1.0/en/" class="btn btn-outline-secondary btn-sm">English</a>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </section>
+
+        <!-- Development version -->
         <section class="mb-5">
             <div class="card border">
                 <div class="card-body p-4">
@@ -117,7 +132,7 @@ <h2 class="h3 mb-0">Development Version</h2>
                     <div class="row gy-3 align-items-end">
                         <div class="col-md">
                             <small class="text-muted d-block mb-2">Read:</small>
-                            <a href="https://discover-cookbook.numfocus.org/dev/" class="btn btn-outline-secondary btn-sm">English</a>
+                            <a href="https://discover-cookbook.numfocus.org/dev/en/" class="btn btn-outline-secondary btn-sm">English</a>
                         </div>
                         <div class="col-md">
                             <small class="text-muted d-block mb-2">Contribute:</small>
@@ -125,13 +140,15 @@ <h2 class="h3 mb-0">Development Version</h2>
                                 <a href="https://github.com/numfocus/DISCOVER-Cookbook/issues/new?template=new_chapter_proposal.yml" class="btn btn-success btn-sm"><i class="bi bi-journal-plus me-1"></i> Write Chapter</a>
                                 <a href="https://github.com/numfocus/DISCOVER-Cookbook/issues/new?template=content_enhancement.yml" class="btn btn-outline-secondary btn-sm"><i class="bi bi-pen"></i> Improve Content</a>
                                 <a href="https://github.com/numfocus/DISCOVER-Cookbook/issues/new?template=bug_report.yml" class="btn btn-outline-danger btn-sm"><i class="bi bi-bug me-1"></i> Report Bug</a>
-                                <a href="#" class="btn btn-outline-success btn-sm"><i class="bi bi-translate"></i> Help Translate</a>
+                                <a href="https://github.com/numfocus/DISCOVER-Cookbook/pull/377" class="btn btn-outline-success btn-sm"><i class="bi bi-translate"></i> Help Translate</a>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </section>
+
+        <!-- Contribute section -->
         <section id="contribute" class="mb-5">
             <div class="card border">
                 <div class="card-body p-4">
@@ -147,10 +164,12 @@ <h2 class="h3 mb-3">Contribute to this Project</h2>
             </div>
         </section>
     </div>
+
+    <!-- Footer -->
     <footer class="container py-4 border-top">
         <div class="d-flex flex-column flex-md-row justify-content-between align-items-center gap-3">
             <span class="text-muted">NumFOCUS &copy; <span id="copyright-year"></span></span>
-            <div class="d-flex gap-3 flex-wrap justify-content-center">
+            <div class="d-flex gap-4 flex-wrap justify-content-center">
                 <a href="https://numfocus.org/privacy-policy" target="_blank" rel="noopener" class="text-muted">Privacy Policy</a>
                 <a href="https://numfocus.org/code-of-conduct" target="_blank" rel="noopener" class="text-muted">Code of Conduct</a>
                 <a href="https://numfocus.org/support" target="_blank" rel="noopener" class="text-muted">Support</a>
@@ -163,7 +182,11 @@ <h2 class="h3 mb-3">Contribute to this Project</h2>
             </div>
         </div>
     </footer>
+
+    <!-- External JS libraries -->
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js" integrity="sha384-ndDqU0Gzau9qJ1lfW4pNLlhNTkCfHzAVBReH9diLvGRem5+R9g2FzA8ZGN954O5Q" crossorigin="anonymous"></script>
+    
+     <!-- Theme switcher script -->
     <script>
         const html = document.documentElement;
         const themeSwitcher = document.getElementById('theme-switcher');