diff --git a/config.toml b/config.toml
index 3d959f824..f884ad76e 100644
--- a/config.toml
+++ b/config.toml
@@ -1,5 +1,5 @@
 # The URL the site will be built for
-base_url = "https://threefoldfoundation.github.io/www_threefold_io/"
+base_url = "https://threefoldfoundation.github.io/www_threefold_io"
 # Change this to your own URL! Please note this variable **must** be uncommented.
 
 title = "ThreeFold"
diff --git a/templates/partials/header.html b/templates/partials/header.html
index 07c018fd2..ffb5999b4 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -39,8 +39,8 @@
                     <a href="{{link_path[1]}}" target="_blank" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
                         {{link_label}}
                     </a>
-                    {% elif base is containing("/www_threefold_io/") %}
-                    <a href="/www_threefold_io/{{link_path[1]}}" target="_blank" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
+                    {% elif base is containing("/www_threefold_io") %}
+                    <a href="/www_threefold_io/{{link_path[1]}}" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
                         {{link_label}}
                     </a>
                     {% else %}
diff --git a/templates/shortcodes/button.html b/templates/shortcodes/button.html
index 9bd2f7dcc..3c68037c9 100644
--- a/templates/shortcodes/button.html
+++ b/templates/shortcodes/button.html
@@ -1,10 +1,18 @@
 {% set path = body | split(pat="href=") | slice(start=1) | first | split(pat=">") | first | trim_start_matches(pat='"')
 | trim_end_matches(pat='"') %}
+{% set base = config.base_url %}
+
 {% if 'https' in path %}
 <button onclick="window.open('{{path}}', '_blank');"
     class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left">
     {{ body | trim_start_matches(pat="<p>") | safe}}
 </button>
+
+{% elif '/www_threefold_io' in base %}
+<button onclick="window.location='{{base}}/{{path}}'"
+    class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left">
+    {{ body | trim_start_matches(pat="<p>") | safe}}
+</button>
 {% else %}
 <button onclick="window.location='{{path}}'"
     class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left">