diff --git a/doc/doc-ui/src/css/custom.css b/doc/doc-ui/src/css/custom.css
new file mode 100644
index 0000000..0dde4c4
--- /dev/null
+++ b/doc/doc-ui/src/css/custom.css
@@ -0,0 +1,3 @@
+.spacer {
+  flex: auto;
+}
diff --git a/doc/doc-ui/src/css/site.css b/doc/doc-ui/src/css/site.css
index 36e1767..97794a5 100644
--- a/doc/doc-ui/src/css/site.css
+++ b/doc/doc-ui/src/css/site.css
@@ -15,3 +15,4 @@
 @import "footer.css";
 @import "highlight.css";
 @import "print.css";
+@import "custom.css";
diff --git a/doc/doc-ui/src/img/chat.svg b/doc/doc-ui/src/img/chat.svg
new file mode 100644
index 0000000..898e57f
--- /dev/null
+++ b/doc/doc-ui/src/img/chat.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   fill="currentColor"
+   class="bi bi-chat-right-text"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="chat.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="54.5625"
+     inkscape:cx="8"
+     inkscape:cy="7.9908362"
+     inkscape:window-width="1440"
+     inkscape:window-height="2523"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M2 1a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h9.586a2 2 0 0 1 1.414.586l2 2V2a1 1 0 0 0-1-1zm12-1a2 2 0 0 1 2 2v12.793a.5.5 0 0 1-.854.353l-2.853-2.853a1 1 0 0 0-.707-.293H2a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2z"
+     id="path2"
+     style="fill:#ffffff" />
+  <path
+     d="M3 3.5a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5M3 6a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9A.5.5 0 0 1 3 6m0 2.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5"
+     id="path4"
+     style="fill:#ffffff" />
+</svg>
diff --git a/doc/doc-ui/src/img/github-mark-white.svg b/doc/doc-ui/src/img/github-mark-white.svg
new file mode 100644
index 0000000..d5e6491
--- /dev/null
+++ b/doc/doc-ui/src/img/github-mark-white.svg
@@ -0,0 +1 @@
+<svg width="98" height="96" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/doc/doc-ui/src/partials/edit-this-page.hbs b/doc/doc-ui/src/partials/edit-this-page.hbs
index 8b13789..8fbbbc0 100644
--- a/doc/doc-ui/src/partials/edit-this-page.hbs
+++ b/doc/doc-ui/src/partials/edit-this-page.hbs
@@ -1 +1,6 @@
 
+{{#if (and page.fileUri (not env.CI))}}
+<div class="edit-this-page"><a href="{{page.fileUri}}">Edit this Page</a></div>
+{{else if (and page.editUrl (or env.FORCE_SHOW_EDIT_PAGE_LINK (not page.origin.private)))}}
+<div class="edit-this-page"><a href="{{page.editUrl}}">Edit this Page</a></div>
+{{/if}}
diff --git a/doc/doc-ui/src/partials/header-content.hbs b/doc/doc-ui/src/partials/header-content.hbs
index 9d43311..1c6b716 100644
--- a/doc/doc-ui/src/partials/header-content.hbs
+++ b/doc/doc-ui/src/partials/header-content.hbs
@@ -14,7 +14,12 @@
     <div id="topbar-nav" class="navbar-menu">
       <div class="navbar-end">
         
-        <a class="navbar-item" href="{{{relativize (resolvePageURL 'home::index.adoc')}}}">Home</a>
+        <a class="navbar-item" target="_blank" href="https://github.com/eclipse-syson/syson">
+          <img class="icon" src="{{{uiRootPath}}}/img/github-mark-white.svg" alt="GitHub"/>
+        </a>
+        <a class="navbar-item" target="_blank" href="https://github.com/eclipse-syson/syson/discussions">
+          <img class="icon" src="{{{uiRootPath}}}/img/chat.svg" alt="Chat"/>
+        </a>
 
         {{#if env.SITE_SEARCH_PROVIDER}}
         <div class="navbar-item search hide-for-print">
diff --git a/doc/doc-ui/src/partials/main.hbs b/doc/doc-ui/src/partials/main.hbs
index 0878f03..9c87875 100644
--- a/doc/doc-ui/src/partials/main.hbs
+++ b/doc/doc-ui/src/partials/main.hbs
@@ -1,12 +1,13 @@
 <main class="article">
 {{> toolbar}}
   <div class="content">
+<div class="spacer"></div>
 {{#if (eq page.layout '404')}}
 {{> article-404}}
 {{else}}
-{{> toc}}
-<div class="spacer"></div>
 {{> article}}
+<div class="spacer"></div>
+{{> toc}}
 {{/if}}
   </div>
 </main>
diff --git a/doc/docs-site/antora-playbook.yml b/doc/docs-site/antora-playbook.yml
index 9944229..2b1b64e 100644
--- a/doc/docs-site/antora-playbook.yml
+++ b/doc/docs-site/antora-playbook.yml
@@ -9,7 +9,7 @@ content:
   sources:
     - url: /usr/app
       start_paths: doc/content
-      branches: HEAD
+      branches: ["main"]
 
 ui:
   bundle: