diff --git a/content/build/compute_.png b/content/build/compute_.png
index 673ab33b1..b01e0f4ed 100644
Binary files a/content/build/compute_.png and b/content/build/compute_.png differ
diff --git a/content/build/network_.png b/content/build/network_.png
index e2823ea0b..f8726d486 100644
Binary files a/content/build/network_.png and b/content/build/network_.png differ
diff --git a/content/build/storage_.png b/content/build/storage_.png
index 01f6ce29a..9e58f2a03 100644
Binary files a/content/build/storage_.png and b/content/build/storage_.png differ
diff --git a/content/community/index.md b/content/community/index.md
index 3b681d292..feff35a5b 100644
--- a/content/community/index.md
+++ b/content/community/index.md
@@ -22,7 +22,6 @@ We're a 100% open-source and community-driven project that builds the critical i
 
 <br>
 
-
 <!-- section 8 (IN THE NEWS) -->
 
 {% row(style="center mtop between") %}
@@ -81,6 +80,13 @@ We're a 100% open-source and community-driven project that builds the critical i
 
 {% end %}
 
+<!-- section 5 (THE TEAM) -->
+
+{% team_sec() %}
+
+## **Meet the Team**
+
+{% end %}
 
 {% community_banner() %}
 
diff --git a/content/footer/_index.md b/content/footer/_index.md
index 8e466eb27..8e4b6e830 100644
--- a/content/footer/_index.md
+++ b/content/footer/_index.md
@@ -34,11 +34,11 @@ extra:
 
 <br>
 
-###### [Main Community](https://t.me/threefold)
+###### [Main Chat](https://t.me/threefold)
 
-###### [Farming Community](https://t.me/threefoldfarmers)
+###### [Farming Chat](https://t.me/threefoldfarmers)
 
-###### [Grid User Community](https://t.me/threefoldtesting)
+###### [Grid User Chat](https://t.me/threefoldtesting)
 
 ###### [Forum](https://forum.threefold.io/)
 
@@ -50,12 +50,16 @@ extra:
 
 <br>
 
-<h6><a target="_self" onclick="window.location.href='/mission'">ThreeFold</a></h6>
+<h6><a target="_self" onclick="window.location.href='/mission'">Mission</a></h6>
+
+<h6><a target="_self" onclick="window.location.href='/community'">Community</a></h6>
 
 <h6><a target="_self" onclick="window.location.href='/partners'">Partners</a></h6>
 
 <h6><a target="_self" onclick="window.location.href='/people'">People</a></h6>
 
+<h6><a target="_self" onclick="window.location.href='/careers'">Careers</a></h6>
+
 <h6><a target="_self" onclick="window.location.href='/blog'">Blog</a></h6>
 
 <h6><a target="_self" onclick="window.location.href='/newsroom'">NewsRoom</a></h6>
diff --git a/content/header/index.md b/content/header/index.md
index bf9458603..b6be44f5d 100644
--- a/content/header/index.md
+++ b/content/header/index.md
@@ -14,39 +14,8 @@ extra:
 - [Farm]("/farm")
 - [TFT]("/tft")
 - [Next Chapter]("/next")
-- Ecosystem
-
-{% row() %}
-
-<button onclick="window.location.href='/people'">
-
-[Our People](/people)
-<br>
-<p class="text-sm">Team, stories, & more</p>
-
-</button>
-
-|||
-
-<button onclick="window.location.href='/partners'">
-
-[Our Partners](/partners)
-<br>
-<p class="text-sm">Explore Our Partners</p>
-
-|||
-
-<button onclick="window.location.href='/community'">
-
-[ThreeFold Community](/community)
-<br>
-<p class="text-sm">Welcome To The Fold</p>
-
-</button>
-
-{% end %}
-
-- More
+- [Blog]("/blog")
+- Help
 
 {% row(style="wide") %}
 
@@ -77,7 +46,7 @@ extra:
 
 |||
 
-#### Resources
+#### Support & Help
 
 <button onclick="openInNewTab('https&#58;//manual.grid.tf')">
 
@@ -87,53 +56,6 @@ extra:
 
 </button>
 
-<button onclick="openInNewTab('https&#58;//library.threefold.me/info/threefold#/threefold__governance/')">
-
-[Governance and Knowledgebase](https://library.threefold.me/info/threefold#/threefold__governance)
-<br>
-<p class="text-sm">Large knowledgebase.</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//github.com/threefoldtech/')">
-
-[GitHub | TF Tech](https://github.com/threefoldtech/)
-<br>
-<p class="text-sm">Code Library & Documentation</p>
-
-</button>
-
-
-|||
-
-#### Dive Deeper
-
-<button onclick="window.location.href='/blog'">
-
-[Blog](/blog)
-<br>
-<p class="text-sm">Explore the Blogs</p>
-
-</button>
-
-<button onclick="window.location.href='/newsroom'">
-
-[Newsroom](/newsroom)
-<br>
-<p class="text-sm">Check the Latest Updates</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//library.threefold.me')">
-
-[Intro Docs](https://library.threefold.me)
-<br>
-<p class="text-sm">Perfect for Newcomers</p>
-
-|||
-
-#### Support & Help
-
 <button onclick="openInNewTab('https&#58;//forum.threefold.io')">
 
 [Forum](https://forum.threefold.io)
@@ -148,12 +70,4 @@ extra:
 
 </button>
 
-<button onclick="window.location.href='/careers'">
-
-[Careers](/careers)
-<br>
-<p class="text-sm">Join the Team</p>
-
-</button>
-
 {% end %}
diff --git a/content/home/index.md b/content/home/index.md
index 79f6d5f3e..71a3879a1 100644
--- a/content/home/index.md
+++ b/content/home/index.md
@@ -184,12 +184,4 @@ If you believe what we believe, then believe us, there is room for you in this m
 <button>[Twitter](https://twitter.com/threefold_io)</button>
 <button>[More Resources](/community)</button>
 
-{% end %}
-
-<!-- section 5 (THE TEAM) -->
-
-{% team_sec() %}
-
-## **Meet the Team**
-
 {% end %}
\ No newline at end of file