diff --git a/templates/memberships/list.html b/templates/memberships/list.html
new file mode 100644
index 000000000..f628a84fb
--- /dev/null
+++ b/templates/memberships/list.html
@@ -0,0 +1,4 @@
+{% extends "index.html" %}
+
+{% block content %}
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/memberships/single.html b/templates/memberships/single.html
new file mode 100644
index 000000000..f9455234c
--- /dev/null
+++ b/templates/memberships/single.html
@@ -0,0 +1,6 @@
+{% extends "index.html" %}
+
+{% block content %}
+ 
+ {% endblock content %}
+
diff --git a/templates/partials/header.html b/templates/partials/header.html
index e56ebbb50..f2868eaa8 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -1,7 +1,7 @@
 {%- set section = get_section(path="header/_index.md") %}
 {% set header_items = section.content | safe | split(pat="<li>") %}
 {% set base = config.base_url %}
-{% set logo_path = base ~ section.extra.logoPath %}
+{% set logo_path = base ~ '/' ~ section.extra.logoPath %}
 
 <header id="header-container">
     <div class="z-10 bg-white fixed w-full top-0">
@@ -40,7 +40,7 @@
                     <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 header_label is starting_with("/") %}
+                    {% elif current_url is starting_with("www_threefold_io") %}
                     {% set path = current_url ~ link_path[1] %}
                     <a href="{{path}}" 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}}
@@ -174,7 +174,7 @@
                                 <a href="{{link_path[1]}}" target="_blank" class="text-lg px-8 py-3 leading-6 font-normal text-gray-900 hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
                                     {{link_label}}
                                 </a>
-                                {% elif header_label is starting_with("/") %}
+                                {% elif current_url is starting_with("www_threefold_io") %}
                                 {% set path = current_url ~ link_path[1] %}
                                 <a href="{{path}}" 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}}
diff --git a/templates/shortcodes/button.html b/templates/shortcodes/button.html
index acf453f9d..f6576a4dd 100644
--- a/templates/shortcodes/button.html
+++ b/templates/shortcodes/button.html
@@ -8,7 +8,7 @@
 </button>
 
 {% elif path is starting_with('/') %}
-{% set btn_path = 'www_threefold_io' ~ path %}
+{% set btn_path = 'www_threefold_io/' ~ path %}
 <button onclick="window.location='{{btn_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}}