diff --git a/archive/action/index.md b/archive/action/index.md
index 0ca5dcfa0..bca2f5034 100644
--- a/archive/action/index.md
+++ b/archive/action/index.md
@@ -115,7 +115,7 @@ Discover the key products that bring us closer to our vision of the new internet
     title_2="New Internet,",
     title_3="Together",  
     button_text_1="Participate",
-    button_link_1="https://form.typeform.com/to/GO9G8ZBa",
+    button_link_1="/signup",
     button_text_2="Stay Updated",
     button_link_2="https://t.me/threefoldnews",
     button_text_3="Chat",
diff --git a/content/about/index.md b/content/about/index.md
index 8f1b66c7d..7f1a35dce 100644
--- a/content/about/index.md
+++ b/content/about/index.md
@@ -170,7 +170,7 @@ Over the past decades, we’ve tackled complex challenges in areas such as data
     title_2="New Internet,",
     title_3="Together",  
     button_text_1="Participate",
-    button_link_1="https://form.typeform.com/to/GO9G8ZBa",
+    button_link_1="/signup",
     button_text_2="Stay Updated",
     button_link_2="https://t.me/threefoldnews",
     button_text_3="Chat",
diff --git a/content/build/index.md b/content/build/index.md
index afe29fdca..788f063d6 100644
--- a/content/build/index.md
+++ b/content/build/index.md
@@ -46,7 +46,7 @@ extra:
 <!-- section 3 (Build With ThreeFold) -->
 
 <div class="lg:py-24 py12 ">
-<div class="container max-w-7xl mx-auto">
+<div class="container max-w-7xl mx-auto  px-4 lg:px-8">
 
 ## Build with ThreeFold
 
@@ -89,7 +89,7 @@ extra:
 
 <!--section 4 (Deploy with ThreeFold)-->
 
- <div class="lg:py-24 py-12 mx-auto max-w-7xl px-4 g:px-8">
+ <div class="lg:py-24 py-12 mx-auto max-w-7xl px-4 lg:px-8">
 
   ## Deploy with ThreeFold
 
@@ -110,7 +110,7 @@ extra:
 
 <!--section 2 (horizontal_features)-->
 
-<!-- <div class="lg:py-24 py-12 mx-auto max-w-7xl px-4 g:px-8">
+<!-- <div class="lg:py-24 py-12 mx-auto max-w-7xl px-4 lg:px-8">
 
 
 
@@ -156,7 +156,7 @@ extra:
 
 <!--section 5 (ThreeFold Stack)-->
 
-<div class="lg:py-24 py-12 mx-auto max-w-7xl lg:px-8">
+<div class="lg:py-24 py-12 mx-auto max-w-7xl  px-4 lg:px-8">
 
   ## The ThreeFold Stack
 
diff --git a/content/farm/index.md b/content/farm/index.md
index 1a4b8ed7c..335c33363 100644
--- a/content/farm/index.md
+++ b/content/farm/index.md
@@ -44,7 +44,7 @@ ThreeFold Farming is a unique concept in the ThreeFold ecosystem where individua
 
 <!-- section 3 (The Farming Process ) -->
 
-<div class="lg:py-24 py12 ">
+<div class="lg:py-24 py-12 px-4 lg:px-8">
 <div class="container max-w-7xl mx-auto">
 
 ## The Farming Process 
@@ -86,7 +86,7 @@ Mycelium can look for the shortest path, has a built-in naming & CDN (Content De
 
 <!-- section 4 (Get Started) -->
 
-<div class="lg:py-24 py12 ">
+<div class="lg:py-24 py12 px-4 lg:px-8">
 <div class="container max-w-7xl mx-auto">
 
 ## Get Started
@@ -125,7 +125,7 @@ Start providing capacity to others and join our Farmers community
 
 <!-- section 5 (The Evolution of Farming) -->
 
-<div class="lg:py-24 py12 ">
+<div class="lg:py-24 py-12 px-4 lg:px-8">
 <div class="container max-w-7xl mx-auto">
 
 ## The Evolution of Farming
@@ -161,9 +161,9 @@ This evolution introduces clearer commercial opportunities and a more accessible
 
 <!----------------------------------------------------------------------------------------->
 
-<!-- section 6 (Join the Movement) -->
+<!-- section 6 (Discover ThreeFold’s Ecosystem) -->
 
-<div class="lg:py-24 py12 ">
+<div class="lg:py-24 py-12 px-4 lg:px-8">
 <div class="container max-w-7xl mx-auto">
 
 ## Discover ThreeFold’s Ecosystem
@@ -235,7 +235,7 @@ Farming is just one core part of our ecosystem, here are all the products drivin
     title_2="New Internet,",
     title_3="Together",  
     button_text_1="Participate",
-    button_link_1="https://form.typeform.com/to/GO9G8ZBa",
+    button_link_1="/signup",
     button_text_2="Stay Updated",
     button_link_2="https://t.me/threefoldnews",
     button_text_3="Chat",
diff --git a/content/home/index.md b/content/home/index.md
index b84ad3f09..08b683b6b 100644
--- a/content/home/index.md
+++ b/content/home/index.md
@@ -156,7 +156,7 @@ extra:
 
 <!-- section 6 (Join the Movement) -->
 
-<div class="lg:py-24 py12 ">
+<div class="lg:py-24 py-12 px-4">
 <div class="container max-w-7xl mx-auto">
 
 ## Join the Movement to Build a New Internet
@@ -264,8 +264,8 @@ plore all the products that are driving this transformation.
 <!----------------------------------------------------------------------------------------->
 
 <!-- section 8 (Faq) -->
-
-<div class="lg:max-w-7xl container mx-auto lg:py-24 py-12">
+<div class="lg:py-24 py-12 px-6">
+<div class="lg:max-w-7xl container mx-auto">
 
 ## Frequently Asked Questions
 
@@ -316,6 +316,7 @@ plore all the products that are driving this transformation.
     }}
 
 </div>
+</div>
 
 <!----------------------------------------------------------------------------------------->
 
@@ -326,7 +327,7 @@ plore all the products that are driving this transformation.
     title_2="New Internet,",
     title_3="Together",  
     button_text_1="Participate",
-    button_link_1="https://form.typeform.com/to/GO9G8ZBa",
+    button_link_1="/signup",
     button_text_2="Stay Updated",
     button_link_2="https://t.me/threefoldnews",
     button_text_3="Chat",
diff --git a/templates/shortcodes/cta.html b/templates/shortcodes/cta.html
index e21d36d39..d57524a86 100644
--- a/templates/shortcodes/cta.html
+++ b/templates/shortcodes/cta.html
@@ -12,7 +12,7 @@
 
 <div class="bg-transparent pt-12 pb-12">
     <div class="mx-auto rounded-2xl bg-white/5 max-w-7xl px-6 py-12 lg:flex lg:items-center lg:justify-between lg:px-20">
-      <h2 class="lg:text-balance max-w-xl leading-tight items-start fade-in">
+      <h2 class="lg:text-balance max-w-xl leading-tight items-start lg:text-left text-center fade-in">
         {{ title_1 }} <br>{{ title_2 }}<br> {{ title_3 }}
       </h2>
       <div class="mt-10 flex items-center 0 gap-x-6 lg:mt-0 lg:shrink-0 flex-wrap justify-center lg:justify-start">
diff --git a/templates/shortcodes/header_section.html b/templates/shortcodes/header_section.html
index 0d58a5d18..db1147c65 100644
--- a/templates/shortcodes/header_section.html
+++ b/templates/shortcodes/header_section.html
@@ -1,5 +1,5 @@
 <div class="">
-  <div class="mx-auto max-w-7xl px-4 mt-8 lg:px-0">
+  <div class="mx-auto max-w-7xl mt-8 lg:px-0">
     <div class="bg-white/5 rounded-md relative isolate overflow-hidden bg-red-700 lg:flex lg:items-center lg:gap-x-20 ">
       
       <!-- Text Column -->
@@ -23,7 +23,7 @@
 </div>
 
 
-<div class="mt-12 flex flex-col lg:flex-row items-center justify-center gap-x-6">
+<div class="mt-6 lg:mt-12 flex flex-col lg:flex-row items-center justify-center gap-x-6">
   <a href="/deploy" class="mr-2 my-2 fade-in rounded-2xl bg-white px-8 py-2.5 text-sm font-semibold text-black shadow-sm hover:text-gray-800 hover:bg-green focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2">Start Deploying</a>
   <a href="https://dashboard.grid.tf/#/tf-grid/node-statistics/" class="mr-2 my-2 fade-in rounded-2xl bg-white px-8 py-2.5 text-sm font-semibold text-black shadow-sm hover:text-gray-800 hover:bg-green focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2" target="_blank">Explore Dashboard</a>
   
diff --git a/templates/shortcodes/tabs.html b/templates/shortcodes/tabs.html
index 81bb3c421..e13692180 100644
--- a/templates/shortcodes/tabs.html
+++ b/templates/shortcodes/tabs.html
@@ -1,5 +1,5 @@
  <section aria-labelledby="features-heading" class="mx-auto max-w-7xl py-4">
-      <div class="mx-auto max-w-2xl px-4 lg:max-w-none lg:px-0">
+      <div class="mx-auto max-w-2xl lg:max-w-none">
         <div class="mt-4">
           <div class="-mx-4 flex overflow-x-auto sm:mx-0">
             <div class="flex-auto border-b border-gray-200 px-4 sm:px-0">
@@ -19,9 +19,9 @@
             </div>
           </div>
   
-          <div id="features-panel-1" class="bg-white/5 space-y-16 p-2 lg:p-6 rounded-sm" aria-labelledby="features-tab-1" role="tabpanel" tabindex="0">
+          <div id="features-panel-1" class="bg-white/5 space-y-16 p-6 rounded-sm" aria-labelledby="features-tab-1" role="tabpanel" tabindex="0">
             
-              <div class="mt-6 lg:mt-0">
+              <div class="">
                 <h3>Compute</h3>
                 <p class="mt-2 text-xl">A self-healing compute fabric designed for resilience, decentralization, and scale.
                 </p>
@@ -41,7 +41,7 @@
               </div>
           </div>
           <div id="features-panel-2" class="bg-white/5 space-y-16 p-6 rounded-sm" aria-labelledby="features-tab-2" role="tabpanel" tabindex="0">
-            <div class="mt-6 lg:mt-0">
+            <div class="">
               <h3>Data</h3>
               <p class="mt-2 text-xl">Private, distributed, and AI-native storage with user sovereignty at its core.
               </p>
@@ -53,7 +53,7 @@
             </div>
           </div>
           <div id="features-panel-3" class="bg-white/5 space-y-16 p-6 rounded-sm" aria-labelledby="features-tab-3" role="tabpanel" tabindex="0">
-            <div class="mt-6 lg:mt-0">
+            <div class="">
               <h3>Network</h3>
               <p class="mt-2 text-xl"> A secure, peer-to-peer internet backbone, self-sustaining, censorship-resistant, and optimized for performance.
               </p>