diff --git a/README.md b/README.md
index 8a2d3e3..60747f5 100644
--- a/README.md
+++ b/README.md
@@ -7,5 +7,5 @@ See https://ldbv-by.github.io/bav4-docs/ for the documentation.
 
 To develop the page locally you need to install ruby. Follow the instructions from: [https://jekyllrb.com/docs/installation/](https://jekyllrb.com/docs/installation/).
 
-To start the dev-server execute in the cloned directory:
+To start the dev-server execute the following command in the `/docs` folder as working directory:
 `bundle exec jekyll serve`
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 9e0053a..efd9893 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -24,12 +24,12 @@
   <header class="page-header" role="banner">
     <div class="page-header-content">
       <div>
-        <a class="page-header-link" href="/">
+        <a class="page-header-link" href="/bav4-docs">
           <image class="page-logo" src="{{'assets/favicon.svg'}}"></image>
         </a>
       </div>
       <div class="page-title-container">
-        <a class="page-header-link" href="/">
+        <a class="page-header-link" href="/bav4-docs">
           <h1 class="project-name">{{ site.title }}</h1>
           <h2 class="project-tagline">{{ site.description }}</h2>
         </a>
@@ -38,8 +38,8 @@ <h2 class="project-tagline">{{ site.description }}</h2>
 
   </header>
 
- {% if page.url != "/" %}
-  <a id="back-to-main" href="/">
+ {% if page.url != "/" and page.url != "/bav4-docs" %}
+  <a id="back-to-main" href="/bav4-docs">
     <span class="md">Back to Main Page</span>
   </a>
 {% endif %}