diff --git a/_includes/footer.html b/_includes/footer.html
index 314ad32..f72de4e 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -33,7 +33,7 @@
                     <span class="dot absolute -ml-5"></span>
                     <a href="{{ site.jobs_url }}" class="footer-link"> We're Hiring </a>
                 </div>
-                <a href="{{ site.help_url }}" class="footer-link"> Get Help </a>
+                <a href="{{ site.help_url }}" class="footer-link">Support</a>
               </div>
           </div>
       </div>
@@ -57,8 +57,8 @@
                 <a href="{{ site.video_url }}" class="footer-link"> Videos </a>
               </div>
               <div class="footer-links-right">
-                <a target="_blank" href="{{ site.github_url }}" class="footer-link link-primary-external">Github </a>
                 <a target="_blank" href="{{ site.discord_url }}" class="footer-link link-primary-external">Discord </a>
+                <a target="_blank" href="{{ site.github_url }}" class="footer-link link-primary-external">Github </a>
                 <a target="_blank" href="{{ site.reddit_url }}" class="footer-link link-primary-external">Reddit </a>
                 <a target="_blank" href="{{ site.twitter_url }}" class="footer-link link-primary-external">Twitter </a>
                 <a target="_blank" href="{{ site.youtube_channel_url }}" class="footer-link link-primary-external">Youtube </a>
@@ -75,7 +75,7 @@
               <div class="footer-links-left">
                   <a href="{{ site.download_url }}" class="footer-link"> Download </a>
                   <a href="{{ site.features_url }}" class="footer-link"> Features </a>
-                  <a href="{{ site.docs_url }}portmaster/architecture/overview" class="footer-link"> Documentation </a>
+                  <a href="{{ site.docs_url }}" class="footer-link"> Docs & FAQ </a>
                   <a target="_blank" href="{{ site.github_url }}/portmaster/" class="footer-link link-primary-external">Source Code </a>
                   <a href="{{ site.backlog_url }}#portmaster" class="footer-link"> Backlog </a>
               </div>
@@ -93,7 +93,7 @@
           </div>
           <div class="footer-links">
               <div class="footer-links-left">
-                  <a href="{{ site.spn_url }}" class="footer-link"> Discover </a>
+                  <a href="{{ site.spn_url }}" class="footer-link"> Features </a>
                   <a href="{{ site.whitepaper_url }}" class="footer-link"> Whitepaper </a>
                   <a target="_blank" href="{{ site.github_url }}/spn/" class="footer-link link-primary-external">Source Code </a>
                   <a href="{{ site.backlog_url }}#spn" class="footer-link"> Backlog </a>
@@ -121,4 +121,3 @@
       </span>
   </div>
 </footer>
-
diff --git a/_includes/nav.html b/_includes/nav.html
index 4839a3a..ad9f637 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -28,7 +28,7 @@
             <a href="{{ site.features_url }}" class="nav-link {% if currentUrl == "features" %}selected{% endif %}"> Features </a>
             <a href="{{ site.pricing_url }}" class="nav-link {% if currentUrl == "pricing" %}selected{% endif %}"> Pricing </a>
             <a href="{{ site.spn_url }}" class="nav-link {% if currentUrl == "spn" %}selected{% endif %}"> SPN </a>
-            <a target="_blank" href="{{ site.docs_url }}" class="nav-link"> Docs </a>
+            <a href="{{ site.about_url }}" class="nav-link {% if currentUrl == "about" %}selected{% endif %}">About</a>
         </div>
         <div class="nav-right-actions">
             <div class="element-x-center-max space-x-3 items-center flex lg:hidden xl:flex">
@@ -43,4 +43,4 @@
         </div>
       </div>
 </nav>
-<div class="horizontal-line"></div>
\ No newline at end of file
+<div class="horizontal-line"></div>