diff --git a/content/header/_index copy.md b/content/header/_index_copy.md
similarity index 100%
rename from content/header/_index copy.md
rename to content/header/_index_copy.md
diff --git a/static/js/custom.js b/static/js/custom.js
index 4871c3333..00448786b 100644
--- a/static/js/custom.js
+++ b/static/js/custom.js
@@ -1,123 +1,164 @@
-
 var displayedMenu = "";
 var hamburgerShown = false;
 let width = screen.width;
 var isMobile = width < 1024;
 
-function readingTime() {
-    let articles = document.querySelectorAll(".article");
-    let times = document.querySelectorAll(".time");
-    const wpm = 225;
-    let words;
-    for (var i = 0; i < articles.length; i++) {
-        words = articles[i].innerText.trim().split(/\s+/).length;
-        let time = Math.ceil(words / wpm);
-        times[i].innerText = `${time} minute read`
-    }
-}
-readingTime()
-
 function toggleMenu(button) {
-    if (displayedMenu === button.id.split("-")[0]) {
-        button.className = button.className.replace(" text-gray-800 bg-stone-200 sm:bg-transparent", " text-gray-900");
-        hideMenu(button.id.split("-")[0]);
-        button.lastElementChild.className = button.lastElementChild.className.replace("rotate-0", "-rotate-90")
-        displayedMenu = "";
-    } else {
-        showMenu(button.id.split("-")[0]);
-        button.lastElementChild.className = button.lastElementChild.className.replace("-rotate-90", "rotate-0")
-        button.className = button.className.replace(" text-gray-900", " text-gray-800 bg-stone-200 sm:bg-transparent");
-        displayedMenu = button.id.split("-")[0]
+  if (displayedMenu === button.id.split("-")[0]) {
+    button.className = button.className.replace(
+      " text-gray-800 bg-stone-200 sm:bg-transparent",
+      " text-gray-900"
+    );
+    hideMenu(button.id.split("-")[0]);
+    button.lastElementChild.className = button.lastElementChild.className.replace(
+      "rotate-0",
+      "-rotate-90"
+    );
+    displayedMenu = "";
+  } else {
+    showMenu(button.id.split("-")[0]);
+    button.lastElementChild.className = button.lastElementChild.className.replace(
+      "-rotate-90",
+      "rotate-0"
+    );
+    button.className = button.className.replace(
+      " text-gray-900",
+      " text-gray-800 bg-stone-200 sm:bg-transparent"
+    );
+    displayedMenu = button.id.split("-")[0];
+  }
+
+  document.addEventListener("click", function (e) {
+    if (!button.id == e.target.id) {
+      hideMenu(button.id.split("-")[0]);
+      button.lastElementChild.className = button.lastElementChild.className.replace(
+        "rotate-0",
+        "-rotate-90"
+      );
+      displayedMenu = "";
     }
+  });
 }
 
 function handleClick(button) {
-    if (button.id === "hamburger-btn" || button.id === "close-hamburger-btn") {
-        toggleHamburger()
-    }
-    if (button.id.indexOf("menu") !== -1) {
-        toggleMenu(button)
-    }
+  if (button.id === "hamburger-btn" || button.id === "close-hamburger-btn") {
+    toggleHamburger();
+  }
+  if (button.id.indexOf("menu") !== -1) {
+    toggleMenu(button);
+  }
 }
 
 function toggleHamburger() {
-    if (hamburgerShown) {
-        hideHamburger();
-        hamburgerShown = false;
-    } else {
-        showHamburger();
-        hamburgerShown = true;
-    }
+  if (hamburgerShown) {
+    hideHamburger();
+    hamburgerShown = false;
+  } else {
+    showHamburger();
+    hamburgerShown = true;
+  }
 }
 
 function showMenu(menuName) {
-    var menuId = menuName + (isMobile ? '-mobile-menu' : '-menu');
-    var menuBtnId = menuName + (isMobile ? '-mobile-menu' : '-menu');
-    var menuElement = document.getElementById(menuId)
-    menuElement.className = menuElement.className.replace(" hidden", "");
-    let children = document.querySelectorAll('.nav_menu')
-    for (let i = 0; i < children.length; i++) {
-        if (menuElement !== children[i]) {
-            let btnId = `${children[i].id}-btn`;
-            let btn = document.getElementById(btnId);
-            if (btn && !children[i].classList.contains('hidden')) {
-                children[i].classList.add('hidden')
-                btn.lastElementChild.classList.replace("rotate-0", "-rotate-90")
-            }
-        }
+  var menuId = menuName + (isMobile ? "-mobile-menu" : "-menu");
+  var menuBtnId = menuName + (isMobile ? "-mobile-menu" : "-menu");
+  var menuElement = document.getElementById(menuId);
+  menuElement.className = menuElement.className.replace(" hidden", "");
+  let children = document.querySelectorAll(".nav_menu");
+  for (let i = 0; i < children.length; i++) {
+    if (menuElement !== children[i]) {
+      let btnId = `${children[i].id}-btn`;
+      let btn = document.getElementById(btnId);
+      if (btn && !children[i].classList.contains("hidden")) {
+        children[i].classList.add("hidden");
+        btn.lastElementChild.classList.replace("rotate-0", "-rotate-90");
+      }
     }
-    setTimeout(function () {
-        menuElement.className = menuElement.className.replace("duration-200 ease-in opacity-0 -translate-y-1", "duration-150 ease-out opacity-1 -translate-y-0");
-    }, 10);
+  }
+  setTimeout(function () {
+    menuElement.className = menuElement.className.replace(
+      "duration-200 ease-in opacity-0 -translate-y-1",
+      "duration-150 ease-out opacity-1 -translate-y-0"
+    );
+  }, 10);
 }
 
 function hideMenu(menuName) {
-    var menuId = menuName + (isMobile ? '-mobile-menu' : '-menu');
-    var menuElement = document.getElementById(menuId)
-    menuElement.className = menuElement.className.replace("duration-150 ease-out opacity-1 -translate-y-0", "duration-200 ease-in opacity-0 -translate-y-1");
-    setTimeout(function () {
-        menuElement.className = menuElement.className + " hidden"
-    }, 300);
+  var menuId = menuName + (isMobile ? "-mobile-menu" : "-menu");
+  var menuElement = document.getElementById(menuId);
+  var btnId = `${menuElement.id}-btn`;
+  let btn = document.getElementById(btnId);
+  menuElement.className = menuElement.className.replace(
+    "duration-150 ease-out opacity-1 -translate-y-0",
+    "duration-200 ease-in opacity-0 -translate-y-1"
+  );
+  btn.lastElementChild.className = btn.lastElementChild.className.replace(
+    "rotate-0",
+    "-rotate-90"
+  );
+  setTimeout(function () {
+    if (!menuElement.classList.contains("hidden")) {
+      menuElement.classList.add("hidden");
+    }
+  }, 300);
 }
 
 function showHamburger() {
-    document.getElementById('header-container').className = "overflow-hidden";
-    document.getElementById('hamburger').className = "fixed mt-16 z-20 top-0 inset-x-0 transition transform origin-top-right";
-    document.getElementById('hamburger-btn').className = "hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
-    document.getElementById('close-hamburger-btn').className = "inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
+  document.getElementById("header-container").className = "overflow-hidden";
+  document.getElementById("hamburger").className =
+    "fixed mt-16 z-20 top-0 inset-x-0 transition transform origin-top-right";
+  document.getElementById("hamburger-btn").className =
+    "hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
+  document.getElementById("close-hamburger-btn").className =
+    "inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
 }
 
 function hideHamburger() {
-    document.getElementById('header-container').className = "";
-    document.getElementById('hamburger').className = "hidden absolute z-20 top-0 inset-x-0 transition transform origin-top-right lg:hidden";
-    document.getElementById('hamburger-btn').className = "inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
-    document.getElementById('close-hamburger-btn').className = "hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
-    if (displayedMenu !== "") {
-        hideMenu(displayedMenu);
-    }
+  document.getElementById("header-container").className = "";
+  document.getElementById("hamburger").className =
+    "hidden absolute z-20 top-0 inset-x-0 transition transform origin-top-right lg:hidden";
+  document.getElementById("hamburger-btn").className =
+    "inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
+  document.getElementById("close-hamburger-btn").className =
+    "hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
+  if (displayedMenu !== "") {
+    hideMenu(displayedMenu);
+  }
 }
+
 function toggleFilter() {
-    var filterMenu = document.getElementById("filter-menu")
-    if (filterMenu.className.includes("hidden")) {
-        filterMenu.className = filterMenu.className.replace("hidden", " ")
-    } else {
-        filterMenu.className = filterMenu.className + " hidden"
-    }
+  var filterMenu = document.getElementById("filter-menu");
+  if (filterMenu.className.includes("hidden")) {
+    filterMenu.className = filterMenu.className.replace("hidden", " ");
+  } else {
+    filterMenu.className = filterMenu.className + " hidden";
+  }
 }
 window.onload = function () {
-    let elements = document.getElementsByTagName("button");
-    let buttons = [...elements]
+  let elements = document.getElementsByTagName("button");
+  let buttons = [...elements];
 
-    buttons.forEach((button) => {
-        button.addEventListener('click', function () {
-            handleClick(button)
-        });
-    })
-
-    document.getElementById("filter-btn").addEventListener('click', toggleFilter);
-    document.getElementById("mobile-learn-btn").addEventListener('click', toggleMenu);
-}
+  buttons.forEach((button) => {
+    button.addEventListener("click", function () {
+      handleClick(button);
+    });
+  });
+};
 
 function openInNewTab(url) {
-    window.open(url, '_blank').focus()
-}
\ No newline at end of file
+  window.open(url, "_blank").focus();
+}
+
+function readingTime() {
+  let articles = document.querySelectorAll(".article");
+  let times = document.querySelectorAll(".time");
+  const wpm = 225;
+  let words;
+  for (var i = 0; i < articles.length; i++) {
+    words = articles[i].innerText.trim().split(/\s+/).length;
+    let time = Math.ceil(words / wpm);
+    times[i].innerText = `${time} minute read`;
+  }
+}
+readingTime();
+document.getElementById("year").innerHTML = new Date().getFullYear();
diff --git a/templates/header.html b/templates/header.html
deleted file mode 100644
index e8daba4e0..000000000
--- a/templates/header.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<!--
-  Tailwind UI components require Tailwind CSS v1.8 and the @tailwindcss/ui plugin.
-  Read the documentation to get started: https://tailwindui.com/documentation
---><!-- This example requires Tailwind CSS v1.4.0+ -->
-
-<script type="text/javascript">
-    
-    var displayedMenu = "";
-    var hamburgerShown = false;
-    let width = screen.width;
-    var isMobile = width < 1024;
-
-    function toggleMenu(button) {
-        if (displayedMenu === button.id.split("-")[0]) { 
-            button.className = button.className.replace(" text-blue-500 bg-stone-200 sm:bg-transparent", " text-gray-900");
-            hideMenu(button.id.split("-")[0]);
-            button.lastElementChild.className = button.lastElementChild.className.replace("rotate-0", "-rotate-90")
-            displayedMenu = "";
-        }
-        else { 
-            showMenu(button.id.split("-")[0]);
-            button.lastElementChild.className = button.lastElementChild.className.replace("-rotate-90", "rotate-0")
-            button.className = button.className.replace(" text-gray-900", " text-blue-500 bg-stone-200 sm:bg-transparent");
-            displayedMenu = button.id.split("-")[0]
-        }
-    }
-
-    function handleClick(button) {
-        if (button.id === "hamburger-btn" || button.id === "close-hamburger-btn") { toggleHamburger() }
-        if (button.id.indexOf("menu") !== -1 ) { 
-            toggleMenu(button) 
-        }
-    }
-
-    function toggleHamburger() {
-        if (hamburgerShown) { 
-            hideHamburger();
-            hamburgerShown = false;
-        }
-        else { 
-            showHamburger();
-            hamburgerShown = true;
-        }
-    }
-
-    function showMenu(menuName) {
-        var menuId = menuName + (isMobile ? '-mobile-menu' : '-menu');
-        var menuBtnId = menuName + (isMobile ? '-mobile-menu' : '-menu');
-        var menuElement = document.getElementById(menuId)
-        menuElement.className = menuElement.className.replace(" hidden" , "");
-        setTimeout(function() { menuElement.className = menuElement.className.replace("duration-200 ease-in opacity-0 -translate-y-1", "duration-150 ease-out opacity-1 -translate-y-0"); }, 10);
-    }
-
-    function hideMenu(menuName) {
-        var menuId = menuName + (isMobile ? '-mobile-menu' : '-menu');
-        var menuElement = document.getElementById(menuId)
-        menuElement.className = menuElement.className.replace("duration-150 ease-out opacity-1 -translate-y-0", "duration-200 ease-in opacity-0 -translate-y-1");
-        setTimeout(function() { menuElement.className = menuElement.className + " hidden" }, 300);
-    }
-
-    function showHamburger() {
-        document.getElementById('header-container').className = "overflow-hidden";
-        document.getElementById('hamburger').className = "fixed mt-16 z-20 top-0 inset-x-0 transition transform origin-top-right";
-        document.getElementById('hamburger-btn').className = "hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2";
-        document.getElementById('close-hamburger-btn').className = "inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2";
-    }
-
-    function hideHamburger() {
-        document.getElementById('header-container').className = "";
-        document.getElementById('hamburger').className = "hidden absolute z-20 top-0 inset-x-0 transition transform origin-top-right lg:hidden";
-        document.getElementById('hamburger-btn').className = "inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2";
-        document.getElementById('close-hamburger-btn').className = "hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2";
-        if (displayedMenu !== "") { hideMenu(displayedMenu); }
-    }
-
-    window.onload = function(){
-        let elements = document.getElementsByTagName("button");
-        let buttons = [...elements]
-        buttons.forEach((button) => {
-            button.addEventListener( 'click', function() { handleClick(button) });
-        })
-        document.getElementById("mobile-learn-btn").addEventListener( 'click', toggleMenu);
-    }
-
-</script>
-
-
-<!-- set variables used for header template -->
-{% set section = get_section(path="_index.md") %}
-{% set subsections_str = section.subsections | join(sep=" ") %}
-{% set logo_path = get_url(path=section.extra.logo_path | default(value='')) %}
-
-{% if "header/_index.md" in subsections_str %}
-    {% set section = get_section(path="header/_index.md") %}
-    {% set header_items = section.content | safe | split(pat="<li>") %}
-    {% include "partials/header_custom.html" %}
-{% else %}
-    <header id="header-container">
-        {% set header_class = config.extra.header_class | default(value='') %}
-        <div class="{{'z-10 bg-white fixed w-screen ' ~ header_class}}">
-            <div class="relative z-50 shadow">
-            <div class="mx-auto flex z-50 shadow justify-between items-center pl-6 pr-2 md:pr-0 lg:py-5  md:px-12 py-2 lg:px-20 lg:justify-start lg:space-x-20">
-                <div>
-                    <a href="/" class="flex">
-                        <img class="w-48 h-auto sm:w-15" src="{{logo_path}}" alt="FreeFlow Logo" />
-                    </a>
-                </div>
-                <div class="-mr-2 -my-2 lg:hidden">
-                    <button id="hamburger-btn" type="button" class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2">
-                        <!-- Heroicon name: menu -->
-                        <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
-                        </svg>
-                    </button>
-                <button id="close-hamburger-btn" type="button" class="hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2">
-                    <!-- Heroicon name: x -->
-                    <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
-                    </svg>
-                    </button>
-                </div>
-                <div class="hidden lg:flex-1 lg:flex lg:items-center lg:justify-end lg:space-x-12">
-                    <nav class="flex space-x-10">    
-                    {% for page in section.pages %}
-                    {% if page.relative_path == "home/index.md" %} {% continue %} {% endif %}
-                        <a href="{{page.permalink}}" class="text-lg leading-6 text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
-                            {{page.title}}
-                        </a>
-                        <div class="relative">
-                        </div>
-                    {% endfor %}
-                    {% for subsection in section.subsections %}
-                        {% if subsection == "footer/_index.md" %} {% continue %} {% endif %}                        
-                        {% set button_id = subsection ~ "-menu-btn" | slugify %}
-                        <div class="relative">
-                        <button type="button" id="{{button_id}}" class="nav_btn text-gray-900 group inline-flex items-center space-x-2 text-lg leading-6 hover:text-blue-300 focus:outline-none transition ease-in-out duration-150">
-                            <span>{{ subsection }}</span>
-                            <div class="-rotate-90 transition-transform"><svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/></svg></div>
-                        </button>
-                        </div>
-                    {% endfor %}
-                    </nav>
-                </div>
-            </div>
-        </div>
-    {% for subsection in section.subsections %}
-        {% if subsection == "footer/_index.md" %} {% continue %} {% endif %}        
-        {% set submenu_id = subsection ~ "-menu" | slugify %}
-    <nav>
-        <div id="{{submenu_id}}" class="mt-16 sm:mt-0 md:mt-0 lg:mt-0 xl:mt-0 2xl:mt-0 z-30 absolute inset-x-0 transform shadow-lg lg:backdrop-blur xl:backdrop-blur transition duration-200 ease-in opacity-0 -translate-y-1 hidden">
-            <div class="bg-white lg:bg-semi-white md:bg-semi-white xl:bg-semi-white">
-                <div class="mx-8 lg:mx-20 xl:mx-20 px-6 py-4 sm:p-6 md:p-8 lg:p-12 xl:p-12">
-                {{subsection | safe }}
-                </div>
-            </div>            
-            </div>
-        </nav>
-    
-    
-    {% endfor %}
-    
-        
-            <!--
-            Mobile menu, show/hide based on mobile menu state.
-        
-            Entering: "duration-200 ease-out"
-                From: "opacity-0 scale-95"
-                To: "opacity-100 scale-100"
-            Leaving: "duration-100 ease-in"
-                From: "opacity-100 scale-100"
-                To: "opacity-0 scale-95"
-            -->
-        <div id="hamburger" class="hidden fixed mt-16 z-20 top-0 inset-x-0 transition transform origin-top-right lg:hidden">
-            <div>
-                <div class="shadow-xs h-screen bg-white divide-y-2 divide-gray-50">
-                    <div class="pb-6 sm:px-12 md:px-16 lg:px-20 space-y-6 sm:space-y-8 sm:pb-8 max-h-screen overflow-y-auto">
-    
-                        <nav class="flex flex-col justify-around pb-12">
-                        {% for page in section.pages %}
-                            {% if page.relative_path == "home/index.md" %} {% continue %} {% endif %}
-                            <a href="{{page.permalink}}" 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">
-                                {{page.title}}
-                            </a>
-                            <hr/>
-                        {% endfor %}
-                        {% for subsection in section.subsections %}
-                            {% if subsection == "footer/_index.md" %} {% continue %} {% endif %}
-                            {% set button_id = subsection ~ "-mobile-menu-btn" | slugify %}
-                            {% set menu_id = subsection ~ "-mobile-menu" | slugify %}
-
-                            <button type="button" id="{{button_id}}" class="flex flex px-8 py-3 items-start text-left text-gray-900 group inline-flex space-x-2 text-lg leading-6 font-normal hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
-                                <span>{{ subsection }}</span>
-                                <div class="-rotate-90 transition-transform"><svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/></svg></div>
-                            </button>
-
-                            <div id="{{menu_id}}" class="z-50 leading-3 pl-12 pt-6 pb-4 inset-x-0 text-sm transform duration-200 ease-in opacity-0 -translate-y-1 hidden">
-                                {{ subsection | safe }}
-                            </div>
-                        
-                            <hr/>
-                        {% endfor %}
-                        {% if "footer/_index.md" in subsections_str %}
-                        {% set section = get_section(path="footer/_index.md")%}
-                        <div class="mx-8 mt-8">
-                            <div class="space-y-8 lg:max-w-lg xl:max-w-lg lg:mr-8 lg:mb-8 xl:col-span-1">
-                              <img class="w-48 h-auto" src="{{logo_path}}" alt="Company name" />
-                              <p class="text-gray-500 text-base leading-6 ">
-                                {{section.description}}
-                              </p>
-                          </div>
-                          {% endif %}
-                        </nav>                    
-                    </div>
-                
-            </div>
-            
-            </div>
-        </div>
-    
-    
-    </header>
-    
-{% endif %}
-
-
diff --git a/templates/oldheader.html b/templates/oldheader.html
new file mode 100644
index 000000000..c62d9657f
--- /dev/null
+++ b/templates/oldheader.html
@@ -0,0 +1,252 @@
+<!--
+  Tailwind UI components require Tailwind CSS v1.8 and the @tailwindcss/ui plugin.
+  Read the documentation to get started: https://tailwindui.com/documentation
+-->
+<!-- This example requires Tailwind CSS v1.4.0+ -->
+<script type="text/javascript">
+    
+    var displayedMenu = "";
+    var hamburgerShown = false;
+    let width = screen.width;
+    var isMobile = width < 1024;
+
+    function toggleMenu(button) {
+        if (displayedMenu === button.id.split("-")[0]) { 
+            button.className = button.className.replace(" text-blue-500 bg-stone-200 sm:bg-transparent", " text-gray-900");
+            hideMenu(button.id.split("-")[0]);
+            button.lastElementChild.className = button.lastElementChild.className.replace("rotate-0", "-rotate-90")
+            displayedMenu = "";
+        }
+        else { 
+            showMenu(button.id.split("-")[0]);
+            button.lastElementChild.className = button.lastElementChild.className.replace("-rotate-90", "rotate-0")
+            button.className = button.className.replace(" text-gray-900", " text-blue-500 bg-stone-200 sm:bg-transparent");
+            displayedMenu = button.id.split("-")[0]
+        }
+    }
+
+    function handleClick(button) {
+        if (button.id === "hamburger-btn" || button.id === "close-hamburger-btn") { toggleHamburger() }
+        if (button.id.indexOf("menu") !== -1 ) { 
+            toggleMenu(button) 
+        }
+    }
+
+    function toggleHamburger() {
+        if (hamburgerShown) { 
+            hideHamburger();
+            hamburgerShown = false;
+        }
+        else { 
+            showHamburger();
+            hamburgerShown = true;
+        }
+    }
+
+    function showMenu(menuName) {
+        var menuId = menuName + (isMobile ? '-mobile-menu' : '-menu');
+        var menuBtnId = menuName + (isMobile ? '-mobile-menu' : '-menu');
+        var menuElement = document.getElementById(menuId)
+        menuElement.className = menuElement.className.replace(" hidden" , "");
+        setTimeout(function() { menuElement.className = menuElement.className.replace("duration-200 ease-in opacity-0 -translate-y-1", "duration-150 ease-out opacity-1 -translate-y-0"); }, 10);
+    }
+
+    function hideMenu(menuName) {
+        var menuId = menuName + (isMobile ? '-mobile-menu' : '-menu');
+        var menuElement = document.getElementById(menuId)
+        menuElement.className = menuElement.className.replace("duration-150 ease-out opacity-1 -translate-y-0", "duration-200 ease-in opacity-0 -translate-y-1");
+        setTimeout(function() { menuElement.className = menuElement.className + " hidden" }, 300);
+    }
+
+    function showHamburger() {
+        document.getElementById('header-container').className = "overflow-hidden";
+        document.getElementById('hamburger').className = "fixed mt-16 z-20 top-0 inset-x-0 transition transform origin-top-right";
+        document.getElementById('hamburger-btn').className = "hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2";
+        document.getElementById('close-hamburger-btn').className = "inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2";
+    }
+
+    function hideHamburger() {
+        document.getElementById('header-container').className = "";
+        document.getElementById('hamburger').className = "hidden absolute z-20 top-0 inset-x-0 transition transform origin-top-right lg:hidden";
+        document.getElementById('hamburger-btn').className = "inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2";
+        document.getElementById('close-hamburger-btn').className = "hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2";
+        if (displayedMenu !== "") { hideMenu(displayedMenu); }
+    }
+
+    window.onload = function(){
+        let elements = document.getElementsByTagName("button");
+        let buttons = [...elements]
+        buttons.forEach((button) => {
+            button.addEventListener( 'click', function() { handleClick(button) });
+        })
+        document.getElementById("mobile-learn-btn").addEventListener( 'click', toggleMenu);
+    }
+</script>
+<!-- set variables used for header template -->
+{% set section = get_section(path="_index.md") %}
+{% set subsections_str = section.subsections | join(sep=" ") %}
+{% set logo_path = get_url(path=section.extra.logo_path | default(value='')) %}
+
+{% if "header/_index.md" in subsections_str %}
+    {% set section = get_section(path="header/_index.md") %}
+    {% set header_items = section.content | safe | split(pat="
+<li>
+    ") %}
+    {% include "partials/header_custom.html" %}
+{% else %}
+    <header id="header-container">
+        {% set header_class = config.extra.header_class | default(value='') %}
+        <div class="{{'z-10 bg-white fixed w-screen ' ~ header_class}}">
+            <div class="relative z-50 shadow">
+                <div class="mx-auto flex z-50 shadow justify-between items-center pl-6 pr-2 md:pr-0 lg:py-5  md:px-12 py-2 lg:px-20 lg:justify-start lg:space-x-20">
+                    <div>
+                        <a href="/" class="flex">
+                            <img class="w-48 h-auto sm:w-15" src="{{logo_path}}" alt="FreeFlow Logo">
+                        </a>
+                    </div>
+                    <div class="-mr-2 -my-2 lg:hidden">
+                        <button id="hamburger-btn" type="button" class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2">
+                            <!-- Heroicon name: menu -->
+                            <svg
+                                class="h-6 w-6"
+                                xmlns="http://www.w3.org/2000/svg"
+                                fill="none"
+                                viewBox="0 0 24 24"
+                                stroke="currentColor"
+                            >
+                                <path
+                                    stroke-linecap="round"
+                                    stroke-linejoin="round"
+                                    stroke-width="2"
+                                    d="M4 6h16M4 12h16M4 18h16"
+                                />
+                            </svg>
+                        </button>
+                        <button id="close-hamburger-btn" type="button" class="hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2">
+                            <!-- Heroicon name: x -->
+                            <svg
+                                class="h-6 w-6"
+                                xmlns="http://www.w3.org/2000/svg"
+                                fill="none"
+                                viewBox="0 0 24 24"
+                                stroke="currentColor"
+                            >
+                                <path
+                                    stroke-linecap="round"
+                                    stroke-linejoin="round"
+                                    stroke-width="2"
+                                    d="M6 18L18 6M6 6l12 12"
+                                />
+                            </svg>
+                        </button>
+                    </div>
+                    <div class="hidden lg:flex-1 lg:flex lg:items-center lg:justify-end lg:space-x-12">
+                        <nav class="flex space-x-10">
+                            {% for page in section.pages %}
+                    {% if page.relative_path == "home/index.md" %} {% continue %} {% endif %}
+                            <a href="{{page.permalink}}" class="text-lg leading-6 text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
+                                {{page.title}}
+                            </a>
+                            <div class="relative"></div>
+                            {% endfor %}
+                    {% for subsection in section.subsections %}
+                        {% if subsection == "footer/_index.md" %} {% continue %} {% endif %}                        
+                        {% set button_id = subsection ~ "-menu-btn" | slugify %}
+                            <div class="relative">
+                                <button type="button" id="{{button_id}}" class="nav_btn text-gray-900 group inline-flex items-center space-x-2 text-lg leading-6 hover:text-blue-300 focus:outline-none transition ease-in-out duration-150">
+                                    <span>{{ subsection }}</span>
+                                    <div class="-rotate-90 transition-transform">
+                                        <svg
+                                            xmlns="http://www.w3.org/2000/svg"
+                                            height="24px"
+                                            viewBox="0 0 24 24"
+                                            width="24px"
+                                            fill="#000000"
+                                        >
+                                            <path d="M0 0h24v24H0z" fill="none"/>
+                                            <path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/>
+                                        </svg>
+                                    </div>
+                                </button>
+                            </div>
+                            {% endfor %}
+                        </nav>
+                    </div>
+                </div>
+            </div>
+            {% for subsection in section.subsections %}
+        {% if subsection == "footer/_index.md" %} {% continue %} {% endif %}        
+        {% set submenu_id = subsection ~ "-menu" | slugify %}
+            <nav>
+                <div id="{{submenu_id}}" class="mt-16 sm:mt-0 md:mt-0 lg:mt-0 xl:mt-0 2xl:mt-0 z-30 absolute inset-x-0 transform shadow-lg lg:backdrop-blur xl:backdrop-blur transition duration-200 ease-in opacity-0 -translate-y-1 hidden">
+                    <div class="bg-white lg:bg-semi-white md:bg-semi-white xl:bg-semi-white">
+                        <div class="mx-8 lg:mx-20 xl:mx-20 px-6 py-4 sm:p-6 md:p-8 lg:p-12 xl:p-12">
+                            {{subsection | safe }}
+                        </div>
+                    </div>
+                </div>
+            </nav>
+            {% endfor %}
+            <!--
+            Mobile menu, show/hide based on mobile menu state.
+        
+            Entering: "duration-200 ease-out"
+                From: "opacity-0 scale-95"
+                To: "opacity-100 scale-100"
+            Leaving: "duration-100 ease-in"
+                From: "opacity-100 scale-100"
+                To: "opacity-0 scale-95"
+            -->
+            <div id="hamburger" class="hidden fixed mt-16 z-20 top-0 inset-x-0 transition transform origin-top-right lg:hidden">
+                <div>
+                    <div class="shadow-xs h-screen bg-white divide-y-2 divide-gray-50">
+                        <div class="pb-6 sm:px-12 md:px-16 lg:px-20 space-y-6 sm:space-y-8 sm:pb-8 max-h-screen overflow-y-auto">
+                            <nav class="flex flex-col justify-around pb-12">
+                                {% for page in section.pages %}
+                            {% if page.relative_path == "home/index.md" %} {% continue %} {% endif %}
+                                <a href="{{page.permalink}}" 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">
+                                    {{page.title}}
+                                </a>
+                                <hr>
+                                {% endfor %}
+                        {% for subsection in section.subsections %}
+                            {% if subsection == "footer/_index.md" %} {% continue %} {% endif %}
+                            {% set button_id = subsection ~ "-mobile-menu-btn" | slugify %}
+                            {% set menu_id = subsection ~ "-mobile-menu" | slugify %}
+                                <button type="button" id="{{button_id}}" class="flex flex px-8 py-3 items-start text-left text-gray-900 group inline-flex space-x-2 text-lg leading-6 font-normal hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
+                                    <span>{{ subsection }}</span>
+                                    <div class="-rotate-90 transition-transform">
+                                        <svg
+                                            xmlns="http://www.w3.org/2000/svg"
+                                            height="24px"
+                                            viewBox="0 0 24 24"
+                                            width="24px"
+                                            fill="#000000"
+                                        >
+                                            <path d="M0 0h24v24H0z" fill="none"/>
+                                            <path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/>
+                                        </svg>
+                                    </div>
+                                </button>
+                                <div id="{{menu_id}}" class="z-50 leading-3 pl-12 pt-6 pb-4 inset-x-0 text-sm transform duration-200 ease-in opacity-0 -translate-y-1 hidden">
+                                    {{ subsection | safe }}
+                                </div>
+                                <hr>
+                                {% endfor %}
+                        {% if "footer/_index.md" in subsections_str %}
+                        {% set section = get_section(path="footer/_index.md")%}
+                                <div class="mx-8 mt-8">
+                                    <div class="space-y-8 lg:max-w-lg xl:max-w-lg lg:mr-8 lg:mb-8 xl:col-span-1">
+                                        <img class="w-48 h-auto" src="{{logo_path}}" alt="Company name">
+                                        <p class="text-gray-500 text-base leading-6 ">
+                                            {{section.description}}
+                                        </p>
+                                    </div>
+                                    {% endif %}
+                                </nav>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </header>
+            {% endif %}
diff --git a/templates/partials/footer.html b/templates/partials/footer.html
index 9560dd4f0..344e1b6aa 100644
--- a/templates/partials/footer.html
+++ b/templates/partials/footer.html
@@ -2,43 +2,36 @@
   Tailwind UI components require Tailwind CSS v1.8 and the @tailwindcss/ui plugin.
   Read the documentation to get started: https://tailwindui.com/documentation
 -->
-
 {%- set section = get_section(path="footer/_index.md") %}
 {%- set logoPath = section.extra.logoPath %}
-
 <html>
-    <head /><body>
+    <head/>
+    <body>
         <div class="mt-6 border-t border-gray-200 pt-2"></div>
         <footer class="bg-white">
-          <div class="max-w-screen-2xl mx-auto py-12 px-4 sm:px-6 lg:py-16 lg:px-8">
-            <div class="xl:flex xl:gap-4">
-              <div class="space-y-8 lg:max-w-sm xl:max-w-sm lg:mr-8 lg:mb-8 xl:col-span-1">
-                <img class="w-16 h-auto sm:w-15" src="{{ get_url(path=logoPath)}}" alt="ThreeFold Logo" />
-                <p class="text-gray-500 text-base leading-6 ">
-                  {{section.description}}
-                </p>
-                {% include "partials/socialLinks.html" %}
+            <div class="max-w-screen-2xl mx-auto py-12 px-4 sm:px-6 lg:py-16 lg:px-8">
+                <div class="xl:flex xl:gap-4">
+                    <div class="space-y-8 lg:max-w-sm xl:max-w-sm lg:mr-8 lg:mb-8 xl:col-span-1">
+                        <img class="w-16 h-auto sm:w-15" src="{{ get_url(path=logoPath)}}" alt="ThreeFold Logo">
+                        <p class="text-gray-500 text-base leading-6 ">
+                            {{section.description}}
+                        </p>
+                        {% include "partials/socialLinks.html" %}
+                    </div>
+                    <div class="mt-6 lg:mt-0 w-full px-8 sm:px-12 md:px-16 lg:px-20 footer-cust">
+                        {{ section.content | safe }}
+                    </div>
+                </div>
+                <div class="mt-12 mx-auto border-t border-gray-200 pt-8">
+                    <p data-v-14efe4a7="" class="text-base leading-6 text-gray-400 text-center">
+                        ©
+                        <span id="year"></span>
+                        ThreeFold, All rights reserved.
+                        <a target="_blank" href="https://library.threefold.me/info/legal/#/legal__terms_conditions_websites" class="leading-6 text-gray-500 hover:text-gray-900">Terms &amp; Conditions |</a>
+                        <a target="_blank" href="https://library.threefold.me/info/legal/#/legal__privacypolicy" class="leading-6 text-gray-500 hover:text-gray-900">Privacy Policy</a>
+                    </div>
+                </div>
             </div>
-
-            <div class="mt-6 lg:mt-0 w-full px-8 sm:px-12 md:px-16 lg:px-20 footer-cust">
-                {{ section.content | safe }}
-            </div>
-              
-              </div>
-              <div  class="mt-12 mx-auto border-t border-gray-200 pt-8">
-                <p data-v-14efe4a7="" class="text-base leading-6 text-gray-400 text-center">
-                © 2023 ThreeFold, All rights reserved.
-                <a target="_blank" href="https://library.threefold.me/info/legal/#/legal__terms_conditions_websites" class="leading-6 text-gray-500 hover:text-gray-900">Terms &amp; Conditions |</a>
-                <a target="_blank" href="https://library.threefold.me/info/legal/#/legal__privacypolicy" class="leading-6 text-gray-500 hover:text-gray-900">Privacy Policy</a>
-              </div>
-    
-            </div>
-            
-          </div>
-
-
-          
         </footer>
-        </body>
-        </html>
-        
\ No newline at end of file
+    </body>
+</html>
diff --git a/templates/partials/header copy.html b/templates/partials/header copy.html
deleted file mode 100644
index dedbd6541..000000000
--- a/templates/partials/header copy.html	
+++ /dev/null
@@ -1,230 +0,0 @@
-<!--
-  Tailwind UI components require Tailwind CSS v1.8 and the @tailwindcss/ui plugin.
-  Read the documentation to get started: https://tailwindui.com/documentation
---><!-- This example requires Tailwind CSS v1.4.0+ -->
-
-<script type="text/javascript">
-    
-    var displayedMenu = "";
-    var hamburgerShown = false;
-    let width = screen.width;
-    var isMobile = width < 1024;
-
-    function toggleMenu(button) {
-        if (displayedMenu === button.id.split("-")[0]) { 
-            button.className = button.className.replace("text-blue-500", " text-gray-900");
-            hideMenu(button.id.split("-")[0]);
-            displayedMenu = "";
-        }
-        else { 
-            showMenu(button.id.split("-")[0]);
-            button.className = button.className.replace("text-gray-900", " text-blue-500");
-            displayedMenu = button.id.split("-")[0]
-        }
-    }
-
-    function handleClick(button) {
-        if (button.id === "hamburger-btn" || button.id === "close-hamburger-btn") { toggleHamburger() }
-        if (button.id.indexOf("menu") !== -1 ) { toggleMenu(button) }
-    }
-
-    function toggleHamburger() {
-        console.log("toggling hamburger", hamburgerShown)
-        if (hamburgerShown) { 
-            hideHamburger();
-            hamburgerShown = false;
-        }
-        else { 
-            showHamburger();
-            hamburgerShown = true;
-        }
-    }
-
-    function showMenu(menuName) {
-        var menuId = menuName + (isMobile ? '-mobile-menu' : '-menu');
-        var menuBtnId = menuName + (isMobile ? '-mobile-menu' : '-menu');
-        var menuElement = document.getElementById(menuId)
-        menuElement.className = menuElement.className.replace(" hidden" , "");
-        setTimeout(function() { menuElement.className = menuElement.className.replace("duration-200 ease-in opacity-0 -translate-y-1", "duration-150 ease-out opacity-1 -translate-y-0"); }, 10);
-    }
-
-    function hideMenu(menuName) {
-        var menuId = menuName + (isMobile ? '-mobile-menu' : '-menu');
-        var menuElement = document.getElementById(menuId)
-        menuElement.className = menuElement.className.replace("duration-150 ease-out opacity-1 -translate-y-0", "duration-200 ease-in opacity-0 -translate-y-1");
-        setTimeout(function() { menuElement.className = menuElement.className + " hidden" }, 300);
-    }
-
-    function showHamburger() {
-        document.getElementById('header-container').className = "overflow-hidden";
-        document.getElementById('hamburger').className = "fixed z-20 top-0 inset-x-0 transition transform origin-top-right";
-        document.getElementById('hamburger-btn').className = "hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
-        document.getElementById('close-hamburger-btn').className = "inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
-    }
-
-    function hideHamburger() {
-        document.getElementById('header-container').className = "";
-        document.getElementById('hamburger').className = "hidden absolute z-20 top-0 inset-x-0 transition transform origin-top-right lg:hidden";
-        document.getElementById('hamburger-btn').className = "inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
-        document.getElementById('close-hamburger-btn').className = "hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out";
-        if (displayedMenu !== "") { hideMenu(displayedMenu); }
-    }
-
-    window.onload = function(){
-        let elements = document.getElementsByTagName("button");
-        let buttons = [...elements]
-        buttons.forEach((button) => {
-            button.addEventListener( 'click', function() { handleClick(button) });
-        })
-        document.getElementById("mobile-learn-btn").addEventListener( 'click', toggleMenu);
-    }
-
-    function showMobileNav() {
-        document.getElementById('learn').className = "absolute inset-x-0 transform shadow-lg backdrop-blur transition ease-out duration-150 opacity-1 -translate-y-0";
-    }
-
-</script>
-
-{%- set section = get_section(path="header/_index.md") %}
-{% set header_items = section.content | safe | split(pat="<li>") %}
-
-<header id="header-container">
-    <div class="z-10 bg-white fixed w-screen">
-        <div class="relative z-50 shadow">
-        <div class="mx-auto flex z-50 shadow justify-between items-center px-6 py-5 sm:px-8 md:px-12 sm:py-6 lg:px-20 lg:justify-start lg:space-x-20">
-            <div>
-                <a href="/" class="flex">
-                    <img class="w-20 h-auto sm:w-32" src="{{section.extra.logoPath}}" alt="Ourworld Logo" />
-                </a>
-            </div>
-            <div class="-mr-2 -my-2 lg:hidden">
-                <button id="hamburger-btn" type="button" class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out">
-                    <!-- Heroicon name: menu -->
-                    <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
-                    </svg>
-                </button>
-            <button id="close-hamburger-btn" type="button" class="hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out">
-                <!-- Heroicon name: x -->
-                <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
-                </svg>
-                </button>
-            </div>
-            <div class="hidden lg:flex-1 lg:flex lg:items-center lg:justify-between lg:space-x-12">
-            <nav class="flex space-x-10">
-
-{% for header_item in header_items %}
-{% if not loop.first %}
-    {% set header_arr = header_item | split(pat="</li>") %}
-    {% set header_label = header_arr[0] %}
-    {% if '<a' in header_label %}
-        {% set link_label = header_label | striptags %}
-        {% set link_path = header_label | split(pat="%22") | safe%}
-        <a href="{{link_path[1]}}" class="text-lg leading-6 font-medium text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
-            {{link_label}}
-        </a>
-    {% else %}
-        <div class="relative">
-            {% set button_id = header_label ~ "-menu-btn" | slugify %}
-        <button type="button" id="{{button_id}}" class="font-medium text-gray-900 group inline-flex items-center space-x-2 text-lg leading-6 font-normal hover:text-blue-300 focus:outline-none transition ease-in-out duration-150">
-            <span>{{ header_label }}</span>
-            
-            <!--
-            Heroicon name: chevron-down
-
-            Item active: "text-gray-600", Item inactive: "text-gray-400"
-            -->
-        </button>
-        </div>
-
-    {% endif %}  
-{% endif %}
-{% endfor %}
-</nav>
-
-
-            </div>
-        </div>
-        </div>
-{% for header_item in header_items %}
-{% if not loop.first %}
-    {% set header_arr = header_item | split(pat="</li>") %}
-    {% set header_label = header_arr[0] %}
-    {% set header_menu = header_arr[1] %}
-    {% set menu_id = header_label ~ "-menu" | slugify %}
-
-<nav>
-    <div id="{{menu_id}}" class="mt-0 sm:mt-0 md:mt-0 lg:mt-0 xl:mt-0 2xl:mt-0 z-30 absolute inset-x-0 transform shadow-lg lg:backdrop-blur xl:backdrop-blur transition duration-200 ease-in opacity-0 -translate-y-1 hidden">
-        <div class="bg-white lg:bg-semi-white md:bg-semi-white xl:bg-semi-white">
-            <div class="mx-8 lg:mx-20 xl:mx-20 px-6 py-4 sm:px-8 sm:py-6 lg:px-12 lg:py-8 xl:py-12">
-            {{header_menu | safe }}
-            </div>
-        </div>            
-        </div>
-    </nav>
-
-
-{% endif %}
-{% endfor %}
-
-    
-        <!--
-        Mobile menu, show/hide based on mobile menu state.
-    
-        Entering: "duration-200 ease-out"
-            From: "opacity-0 scale-95"
-            To: "opacity-100 scale-100"
-        Leaving: "duration-100 ease-in"
-            From: "opacity-100 scale-100"
-            To: "opacity-0 scale-95"
-        -->
-    <div id="hamburger" class="hidden fixed mt-12 z-20 top-0 inset-x-0 transition transform origin-top-right lg:hidden">
-        <div>
-            <div class="shadow-xs bg-white divide-y-2 divide-gray-50">
-                <div class="pt-5 pb-6 px-8 sm:px-12 md:px-16 lg:px-20 space-y-6 sm:space-y-8 sm:pb-8 max-h-screen overflow-y-auto">
-
-                    <nav class="flex flex-col justify-around pb-12">
-                    {% for header_item in header_items %}
-
-                        {% if not loop.first %}
-                            {% set header_arr = header_item | split(pat="</li>") %}
-                            {% set header_label = header_arr[0] %}
-                            {% if '<a' in header_label %}
-                                {% set link_label = header_label | striptags %}
-                                {% set link_path = header_label | split(pat="%22") | safe%}
-                                <a href="{{link_path[1]}}" class="text-3xl leading-6 font-normal text-gray-500 hover:text-gray-900 focus:outline-none focus:text-gray-900 my-8 transition ease-in-out duration-150 mt-0">
-                                    {{link_label}}
-                                </a>
-                            {% else %}
-                                {% set button_id = header_label ~ "-mobile-menu-btn" | slugify %}
-                                    <!-- Item active: "text-gray-900", Item inactive: "text-gray-500" -->
-                                    <button type="button" id="{{button_id}}" class="flex flex-col items-start text-left text-gray-500 group inline-flex space-x-2 text-3xl my-8 leading-6 font-normal hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
-                                        <span>{{ header_label }}</span>
-                                    <!--
-                                    Heroicon name: chevron-down
-                    
-                                    Item active: "text-gray-600", Item inactive: "text-gray-400"
-                                    -->
-                                    {% set menu_id = header_label ~ "-mobile-menu" | slugify %}
-                                    <div id="{{menu_id}}" class="z-50 leading-3 mt-0 pl-12 inset-x-0 text-sm transform duration-200 ease-in opacity-0 -translate-y-1 hidden">
-                                        {{ header_arr[1] | safe }}
-                                    </div>
-                                    </button>
-                    
-                            {% endif %}
-                            {% if header_arr[1] %}  
-
-                            {% endif %}
-                        {% endif %}
-                    {% endfor %}
-                    </nav>                    
-                </div>
-            
-        </div>
-        
-        </div>
-    </div>
-
-
-</header>
diff --git a/templates/partials/header.html b/templates/partials/header.html
index 7d53c5bea..02a3a4e51 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -26,36 +26,34 @@
             </div>
             <div class="hidden lg:flex-1 lg:flex lg:items-center lg:justify-between lg:space-x-6">
             <nav class="flex space-x-10">
-
             {% for header_item in header_items %}
-            {% if not loop.first %}
-                {% set header_arr = header_item | split(pat="</li>") %}
-                {% set header_label = header_arr[0] %}
-                {% if '<a' in header_label %}
-                    {% set link_label = header_label | striptags %}
-                    {% set link_path = header_label | split(pat="%22") | safe%}
-                    {% if header_label is containing("http") %}
-                        {% if header_label is not containing("threefold") %}
-                        <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>
-                        {% endif %}
-                    {% else %}
-                    <a href="{{ get_url(path=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>
-                    {% endif %}
-                {% else %}
-                    <div class="relative">
-                        {% set button_id = header_label ~ "-menu-btn" | slugify %}
-                    <button type="button" id="{{button_id}}" class="nav_btn font-medium text-gray-900 hover:text-gray-500 group inline-flex items-center space-x-2 text-lg leading-6 font-normal hover:text-gray-500 focus:outline-none transition ease-in-out duration-150">
-                        <span>{{ header_label }}</span>
-                        <div class="-rotate-90 transition-transform"><svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/></svg></div>
-                    </button>
-                    </div>
-
-                {% endif %}  
-            {% endif %}
+              {% if not loop.first %}
+                  {% set header_arr = header_item | split(pat="</li>") %}
+                  {% set header_label = header_arr[0] %}
+                  {% if "<a" in header_label %}
+                      {% set link_label = header_label | striptags %}
+                      {% set link_path = header_label | split(pat="%22") | safe %}
+                      {% if header_label is containing("http") %}
+                          {% if header_label is not containing("threefold") %}
+                          <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>
+                          {% endif %}
+                      {% else %}
+                      <a href="{{ get_url(path=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>
+                      {% endif %}
+                  {% else %}
+                      <div class="relative">
+                          {% set button_id = header_label ~ "-menu-btn" | slugify %}
+                      <button type="button" id="{{button_id}}" class="nav_btn text-gray-900 hover:text-gray-500 group inline-flex items-center space-x-2 text-lg leading-6 font-normal hover:text-gray-500 focus:outline-none transition ease-in-out duration-150">
+                          {{ header_label }}
+                          <div class="-rotate-90 transition-transform"><svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/></svg></div>
+                      </button>
+                      </div>
+                  {% endif %}  
+              {% endif %}
             {% endfor %}
             </nav>
 
@@ -178,7 +176,7 @@
                             {% else %}
                                 {% set button_id = header_label ~ "-mobile-menu-btn" | slugify %}
                                     <button type="button" id="{{button_id}}" class="flex flex px-8 py-3 items-start text-left text-gray-900 group inline-flex space-x-2 text-lg leading-6 font-normal hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
-                                        <span>{{ header_label }}</span>
+                                        {{ header_label }}
                                         <div class="-rotate-90 transition-transform"><svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/></svg></div>
                                     </button>
                                     {% set menu_id = header_label ~ "-mobile-menu" | slugify %}
diff --git a/templates/partials/header_copy.html b/templates/partials/header_copy.html
new file mode 100644
index 000000000..e69de29bb