diff --git a/source/_data/sidebar.yml b/source/_data/sidebar.yml
index a5fbc33..82d725a 100644
--- a/source/_data/sidebar.yml
+++ b/source/_data/sidebar.yml
@@ -4,7 +4,11 @@ docs:
     building: building.html
 #    milestones: milestones.html
     design: design.html
-    team: team.html
+    # team: team.html
     faq: faq.html
     contributor_guide: contributor_guide.html
+  Guides:
+    Testnet 0: t0.html
+    Testnet 1: t1.html
+    Custom Testnet: custom-nimbus-testnet.html
     
\ No newline at end of file
diff --git a/themes/navy/languages/en.yml b/themes/navy/languages/en.yml
index fc6ab95..8c8694a 100644
--- a/themes/navy/languages/en.yml
+++ b/themes/navy/languages/en.yml
@@ -30,3 +30,7 @@ sidebar:
     team: Team
     options: Beyond the Basics
     contributor_guide: Contributor Guide
+    Testnet 0: Testnet 0
+    Testnet 1: Testnet 1
+    Custom Testnet: Custom Testnet
+    Guides: Guides
diff --git a/themes/navy/layout/partial/footer.swig b/themes/navy/layout/partial/footer.swig
index 5bbd984..15e6630 100644
--- a/themes/navy/layout/partial/footer.swig
+++ b/themes/navy/layout/partial/footer.swig
@@ -7,9 +7,9 @@
                   <p class="footer-header">Social links</p>
                   <ul class="footer-list">
                     <li class="footer-link footer-link--fb"><a href="https://www.facebook.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Facebook</span></a></li>
-                    <li class="footer-link footer-link--tw"><a href="https://twitter.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Twitter</span></a></li>
+                    <li class="footer-link footer-link--tw"><a href="https://twitter.com/ethnimbus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Twitter</span></a></li>
                     <li class="footer-link footer-link--ri"><a href="https://chat.status.im/#/register" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Riot</span></a></li>
-                    <li class="footer-link footer-link--gh"><a href="https://github.com/status-im" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Github</span></a></li>
+                    <li class="footer-link footer-link--gh"><a href="https://github.com/status-im/nimbus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Github</span></a></li>
                     <li class="footer-link footer-link--rd"><a href="https://www.reddit.com/r/statusim/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Reddit</span></a></li>
                     <li class="footer-link footer-link--yt"><a href="https://www.youtube.com/statusim" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">YouTube</span></a></li>
                   </ul>
@@ -18,7 +18,7 @@
                 <div class="footer-table__column">
                   <p class="footer-header">More</p>
                   <ul class="footer-list">
-                    <li class="footer-link"><a href="/docs/" target="_blank">Status Docs</a></li>
+                    <li class="footer-link"><a href="https://status.im/docs/" target="_blank">Status Docs</a></li>
                     <li class="footer-link"><a href="https://our.status.im/" target="_blank">Status Blog</a></li>
                     <li class="footer-link"><a href="/contribute/" target="_blank">Jobs</a></li>
                     <li class="footer-link"><a href="/privacy-policy.html" target="_blank">Privacy Policy</a></li>
@@ -31,7 +31,7 @@
                     <li class="footer-link"><a href="https://embark.status.im" target="_blank">Embark</a></li>
                     <li class="footer-link"><a href="https://incubate.status.im/" target="_blank">Incubate</a></li>
                     <li class="footer-link"><a href="https://nimbus.status.im/" target="_blank">Nimbus</a></li>
-                    <li class="footer-link"><a href="https://studio.status.im/" target="_blank">Studio</a></li>
+                    <li class="footer-link"><a href="https://keycard.status.im/" target="_blank">Keycard</a></li>
                   </ul>
                 </div>
 
diff --git a/themes/navy/layout/partial/header-nav.swig b/themes/navy/layout/partial/header-nav.swig
index 06f5249..7d189c6 100644
--- a/themes/navy/layout/partial/header-nav.swig
+++ b/themes/navy/layout/partial/header-nav.swig
@@ -1,9 +1,9 @@
 <ul class="main-nav">
     <li class="item--to-show"><a href="https://status.im/get" class="">App</a></li>
-    <li class="item--to-show"> <a href="https://our.status.im/">Blog</a> </li>
-    <li class="item--to-show"> <a href="https://status.im/docs">Docs</a></li>
+    <li class="item--to-show"> <a href="https://our.status.im/tag/nimbus">Blog</a> </li>
+    <li class="item--to-show"> <a href="/docs">Docs</a></li>
     <li class="item--dropdown item--dropdown-projects"> <a href="#" class="">Projects</a></li>
-    <li><a href="https://status.im/contribute">Contribute</a></li>
+    <li><a href="/docs/contributor_guide.html">Contribute</a></li>
     <li class="item--dropdown"><a href="#" class="item--dropdown-community">Community</a></li>
     <li class="item--more"><a href="#" class="item--more">More</a></li>
 </ul>
\ No newline at end of file
diff --git a/themes/navy/layout/partial/header.swig b/themes/navy/layout/partial/header.swig
index d9333ad..1b8ae5f 100644
--- a/themes/navy/layout/partial/header.swig
+++ b/themes/navy/layout/partial/header.swig
@@ -1,6 +1,6 @@
 <div class="header">
     <div class="header-left">
-        <a class="logo" href={{url_for_lang('/')}}></a>
+        <a class="logo" href="/"></a>
         {{ partial('partial/header-nav') }}
     </div>
     <div class="header-right">
@@ -10,11 +10,11 @@
 
 <div class="mobile-nav-wrap">
     <div class="mobile-nav-inner">
-        <a class="logo" href={{url_for_lang('/')}}></a>
+        <a class="logo" href="/"></a>
         <a class="icon-close mobile-nav-close" href="#"></a>
         <ul class="mobile-nav">
             <li><a href="https://our.status.im/tag/nimbus/">Blog</a></li>
-            <li><a href={{url_for_lang('docs')}}>Docs</a></li>
+            <li><a href="/docs">Docs</a></li>
             <li class="item--dropdown item--to-show">
               <span>Projects</span>
               <ul class="mobile-sub-nav">
diff --git a/themes/navy/source/scss/sidebar.scss b/themes/navy/source/scss/sidebar.scss
index fb488b8..510e3fe 100644
--- a/themes/navy/source/scss/sidebar.scss
+++ b/themes/navy/source/scss/sidebar.scss
@@ -9,7 +9,7 @@ $sidebar-width: 30%;
       display: none;
     }
     strong {
-      display: none;
+      // display: none;
     }
   }
 }
@@ -17,7 +17,7 @@ $sidebar-width: 30%;
 .sidebar-title {
   margin-top: 40px;
   padding: 10px 0;
-  font-family: font-title;
+  // font-family: font-title;
   font-weight: bold;
   color: color-title;
   display: inline-block;
@@ -25,6 +25,10 @@ $sidebar-width: 30%;
   line-height: 1;
 }
 
+.sidebar-title:first-child {
+  margin-top: 0;
+}
+
 .sidebar-link {
   border-radius: 23.5px;
   font-size: 15px;