diff --git a/content/footer/footer.md b/content/footer/footer.md
index b4828b420..1801ba567 100644
--- a/content/footer/footer.md
+++ b/content/footer/footer.md
@@ -17,22 +17,22 @@ items:
     - name: Store TFT
       link: https://new.threefold.io/info/threefold#/threefold__storing_tft
     - name: Be The Internet
-      link: /farming
+      link: https://new.threefold.io/farming
     - name: P2P Cloud
-      link: /cloud
+      link: https://new.threefold.io/cloud
     - name: P2P Marketplace
-      link: /marketplace
+      link: https://new.threefold.io/marketplace
     - name: Digital Twin
-      link: /twin
+      link: https://new.threefold.io/twin
  
  - title: LEARN
    links:
     - name: What is ThreeFold?
-      link: /info/threefold
+      link: https://new.threefold.io/info/threefold
     - name: What is TFT?
-      link: /farming/token
+      link: https://new.threefold.io/farming/token
     - name: Knowledge Base
-      link: /info/threefold
+      link: https://new.threefold.io/info/threefold#/
     - name: Manuals
       link: https://new.threefold.io/info/threefold#/tftech__tf_manuals?id=threefold-manuals
     - name: ThreeFold Foundation
@@ -60,7 +60,7 @@ items:
     - name: Partners
       link: /partners
     - name: Conscious Internet
-      link: /aci
+      link: https://new.threefold.io/aci
     - name: ThreeFold Tech
       link: https://threefold.tech/
 
@@ -75,7 +75,7 @@ items:
 ---
 
 
-[Terms & Conditions](https://new.threefold.io/info/legal#/legal__terms_conditions_websites) | [Privacy Policy](https://new.threefold.io/info/legal#/legal__privacypolicy) | [Impressum]()
+<!-- [Terms & Conditions](https://new.threefold.io/info/legal#/legal__terms_conditions_websites) | [Privacy Policy](https://new.threefold.io/info/legal#/legal__privacypolicy) | [Impressum]()
 
 <br/>
-&#xA9; 2021 ThreeFold, All rights reserved.
+&#xA9; 2021 ThreeFold, All rights reserved. -->
diff --git a/content/navigation/navigation.md b/content/navigation/navigation.md
index 7ae41ecd7..9efa8adf8 100644
--- a/content/navigation/navigation.md
+++ b/content/navigation/navigation.md
@@ -7,19 +7,24 @@ navLinks:
     expandable: true
     submenu:
       - title: Be The Internet
-        path: /farming
+        path: https://new.threefold.io/farming
+        external: true
 
       - title: P2P Cloud
-        path: /cloud
+        path: https://new.threefold.io/cloud
+        external: true
 
       - title: P2P Marketplace
-        path: /marketplace
+        path: https://new.threefold.io/marketplace
+        external: true
 
       - title: Digital Twin
-        path: /twin
+        path: https://new.threefold.io/twin
+        external: true
 
       - title: ThreeFold Token
-        path: /farming/token
+        path: https://new.threefold.io/farming/token
+        external: true
 
   - name: LEARN
     link: '' # /dropdown
@@ -27,13 +32,15 @@ navLinks:
     expandable: true
     submenu:
       - title: Knowledge Base
-        path: /info/threefold
+        path: https://new.threefold.io/info/threefold
+        external: true
 
       - title: Blog
         path: /blog
 
       - title: Forum
         path: https://forum.threefold.io/
+        external: true
 
   - name: ECOSYSTEM
     link: ''
@@ -47,7 +54,7 @@ navLinks:
         path: /partners
 
       - title: Conscious Internet
-        path: /aci
+        path: https://new.threefold.io/aci
         external: true
 
       - title: ThreeFold Tech
@@ -70,8 +77,7 @@ navLinks:
 
 social:
   - icon: telegram-plane
-    link: '' #telegaram link
+    link: 'https://t.me/threefoldnews' #telegaram link
 
-  - icon: linkedin
-    link: '' #linkedin link
+  
 ---
diff --git a/src/components/custom/Navbar/Navbar.vue b/src/components/custom/Navbar/Navbar.vue
index 37026b1e1..ef903629a 100644
--- a/src/components/custom/Navbar/Navbar.vue
+++ b/src/components/custom/Navbar/Navbar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="fixed inset-0 h-16 bg-white">
+  <div class="fixed inset-0 h-16 bg-teal-200">
     <header
       class="flex items-center justify-between flex-wrap container mx-auto px-4 sm:px-0 py-4 transition-all transition-500"
       :class="{
@@ -12,14 +12,14 @@
           <a href="/" class="flex">
             <g-image
               :src="require(`!!assets-loader!@images/TFN_black.svg`)"
-              class="mr-3 fill-current w-3/5"
+              class="mr-3 fill-current logo"
               v-if="theme == 'light'"
               alt=""
             />
 
             <g-image
               :src="require(`!!assets-loader!@images/TFN_black.svg`)"
-              class="mr-3 fill-current w-3/5"
+              class="mr-3 fill-current logo"
               v-else
               alt=""
             />
@@ -53,9 +53,9 @@
         </div>
         <div class="text-gray-400 sm:block md:hidden">
           <ul class="list-none flex justify-center md:justify-end">
-            <li class="mr-0 sm:mr-6">
+            <!-- <li class="mr-0 sm:mr-6">
               <theme-switcher v-on="$listeners" :theme="theme" />
-            </li>
+            </li> -->
             <li
               :key="element.name"
               v-for="(element, index) in navigation.social"
@@ -80,7 +80,7 @@
 
       <nav
         :class="isOpen ? 'block' : 'hidden'"
-        class="navbar md:order-2 px-2 pt-2 pb-4 sm:flex sm:p-0 sm:w-100 bg-white"
+        class="navbar md:order-2 px-2 pt-2 pb-4 sm:flex sm:p-0 sm:w-100 bg-teal-200"
       >
         <div
           :key="index"
@@ -194,9 +194,9 @@
           />
         </div> -->
         <ul class="list-none inline-flex justify-center md:justify-end">
-          <li class="mr-0 sm:mr-6">
+          <!-- <li class="mr-0 sm:mr-6">
             <ThemeSwitcher v-on="$listeners" :theme="theme" />
-          </li>
+          </li> -->
           <li
             :key="element.name"
             v-for="(element, index) in navigation.social"
@@ -311,6 +311,9 @@ a.active--exact.active {
 .navbar {
   width: auto;
 }
+.logo {
+  max-width: 180px;
+}
 @media (max-width: 768px) {
   .navbar {
     width: 100%;
diff --git a/src/components/marketing/sections/cta-sections/Footer.vue b/src/components/marketing/sections/cta-sections/Footer.vue
index d65878e3c..35bcfabc4 100644
--- a/src/components/marketing/sections/cta-sections/Footer.vue
+++ b/src/components/marketing/sections/cta-sections/Footer.vue
@@ -121,14 +121,14 @@
           </div>
         </div>
         <div
-          class="mt-12 grid md:grid-cols-4 sm:grid-cols-2 xl:mt-0 xl:col-span-2"
+          class="mt-12 grid md:grid-cols-5 sm:grid-cols-2 xl:mt-0 xl:col-span-2"
         >
           <!-- class="mt-12 grid grid-cols-2 gap-8 xl:mt-0 xl:col-span-2" -->
 
           <div
             v-for="footerLink in record.items"
             :key="footerLink.title"
-            class="md:grid md:grid-cols-3"
+            class=""
           >
             <div>
               <h4
@@ -162,6 +162,9 @@
       <div class="mt-12 border-t border-gray-200 pt-8">
         <p class="text-base leading-6 text-gray-400 xl:text-center">
           &#xA9; 2021 ThreeFold, All rights reserved.
+          <a class="leading-6 text-gray-500 hover:text-gray-900" target="_blank" href="https://new.threefold.io/info/legal#/legal__terms_conditions_websites">Terms & Conditions | </a>
+          <a class="leading-6 text-gray-500 hover:text-gray-900" target="_blank" href="https://new.threefold.io/info/legal#/legal__privacypolicy">Privacy Policy | </a>
+          <a class="leading-6 text-gray-500 hover:text-gray-900" target="_blank" href="#">Impressum</a>
         </p>
       </div>
     </div>
diff --git a/src/layouts/Default.vue b/src/layouts/Default.vue
index f852b23f9..b00b033b0 100644
--- a/src/layouts/Default.vue
+++ b/src/layouts/Default.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="">
-    <!-- <NavBar
+    <NavBar
       :navigation="$static.navigation"
       @setTheme="setTheme"
       :theme="this.theme"
-    /> -->
+    />
     <slot />
-    <!-- <Footer 
+    <Footer 
       :record="$static.footer"
       @setTheme="setTheme"
-      :theme="this.theme" /> -->
+      :theme="this.theme" />
   </div>
 </template>
 
diff --git a/src/pages/Index.vue b/src/pages/Index.vue
index a917768e2..76f0d731e 100644
--- a/src/pages/Index.vue
+++ b/src/pages/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <Layout :hideHeader="true" :disableScroll="true">
-    <div class="container-fluid sm:pxi-0 mx-auto overflow-x-hidden">
+    <div class="container-fluid pt-16 sm:pxi-0 mx-auto overflow-x-hidden">
       <g-image
         v-if="$page.markdownPage.solution_image"
         :src="$page.markdownPage.solution_image.src"