diff --git a/content/blog/truly_sovereign_tech/index.md b/content/blog/truly_sovereign_tech/index.md
index fe1dd601f..c75da5b08 100644
--- a/content/blog/truly_sovereign_tech/index.md
+++ b/content/blog/truly_sovereign_tech/index.md
@@ -65,13 +65,14 @@ Instead of exposing bloated APIs or fully fledged orchestration platforms, Zero
 
 <br/>
 
-| **Primitive** | **Functionality** |
-| ----- | ----- |
-| VM | Stateless KVM-based virtual machines with declarative configuration |
-| ZeroDB (ZDB) | A lightweight key-value store with optional encryption |
-| Mycelium | Mesh-based overlay network with IPv6, E2E encryption, and NAT traversal |
-| Network Setup | Create private networks, web gateways, public IP exposure |
-| Filesystem | Encrypted, snapshot-based persistent volumes using ZFS |
+| **Primitive**     | **Functionality**                                                                 |
+|-------------------|------------------------------------------------------------------------------------|
+| **VM**            | Stateless KVM-based virtual machines with declarative configuration               |
+| **ZeroDB (ZDB)**  | A lightweight key-value store with optional encryption                            |
+| **Mycelium**      | Mesh-based overlay network with IPv6, E2E encryption, and NAT traversal           |
+| **Network Setup** | Create private networks, web gateways, public IP exposure                         |
+| **Filesystem**    | Encrypted, snapshot-based persistent volumes using ZFS                            |
+
 
 <br/>
 
@@ -187,4 +188,5 @@ Start building sovereignty today.
 
 <br/>
 
-**[Explore how Zero OS](https://github.com/threefoldtech/zos)** and the **[ThreeFold Grid](https://docs.threefold.io/docs/introduction)** can power your next step.
\ No newline at end of file
+**[Explore how Zero OS](https://github.com/threefoldtech/zos)** and the **[ThreeFold Grid](https://docs.threefold.io/docs/introduction)** can power your next step.
+
diff --git a/content/home/index.md b/content/home/index.md
index d720b3c64..42d67b590 100644
--- a/content/home/index.md
+++ b/content/home/index.md
@@ -151,7 +151,19 @@ Starting this summer, farming is evolving. With the launch of the ThreeFold Mark
 ) }}
 
 
-{{ header_section() }}
+{{ card_with_image(
+    image_src="/images/tft_logo.png",
+    image_alt="TF logo",
+    title="ThreeFold Cloud",
+    subtitle="Open-Source Cloud",
+    description="ThreeFold is open for developers and system administrators. Deploy virtual machines, containers, Kubernetes clusters, web gateways, and more on top of a best-effort decentralized open source cloud.",
+    button_link="https://manual.grid.tf/",
+    button_text="Manual",
+    image_src_right="/images/app.png",
+    image_alt_right="App screenshot"
+
+
+) }}
 
 </div>
 
@@ -250,7 +262,7 @@ Explore all the products that are driving this transformation.
 
 <!----------------------------------------------------------------------------------------->
 
-<!-- section 7 (More Resilient)-->
+<!-- section 8 (More Resilient)-->
 
 <div class="lg:py-24 py-12 text-center">
 
@@ -272,7 +284,7 @@ Explore all the products that are driving this transformation.
 
 <!----------------------------------------------------------------------------------------->
 
-<!-- section 8 (Faq) -->
+<!-- section 9 (Faq) -->
 <div class="lg:py-24 py-12 px-6">
 <div class="lg:max-w-7xl container mx-auto">
 
@@ -334,7 +346,7 @@ Explore all the products that are driving this transformation.
 
 <!----------------------------------------------------------------------------------------->
 
-<!-- section 9 Cta -->
+<!-- section 10 Cta -->
 
 {{ cta(
     title_1="Building a",
diff --git a/css/index.css b/css/index.css
index 37f477463..cb6927158 100644
--- a/css/index.css
+++ b/css/index.css
@@ -131,6 +131,28 @@ a img:hover {
 
 }
 
+
+
+table{
+  @apply table-auto text-white border border-gray-700 text-left w-full;
+}
+
+thead{
+  @apply bg-gray-800 text-white;
+}
+
+th{
+  @apply border border-gray-600 px-4 py-2;
+}
+
+tbody{
+  @apply bg-black text-gray-100;
+}
+
+td{
+  @apply border border-gray-600 px-4 py-2;
+}
+
 .green:hover {
   background-color: #7ad993 !important;
 }
diff --git a/templates/shortcodes/header_section.html b/templates/shortcodes/card_with_image.html
similarity index 51%
rename from templates/shortcodes/header_section.html
rename to templates/shortcodes/card_with_image.html
index b9901a771..242e75761 100644
--- a/templates/shortcodes/header_section.html
+++ b/templates/shortcodes/card_with_image.html
@@ -1,26 +1,35 @@
-<div class="">
+{% set title = title | default(value="") %}
+{% set image_src = image_src | default(value="") %}
+{% set image_alt = image_alt | default(value="") %}
+{% set description = description | default(value="") %}
+{% set subtitle = subtitle | default(value="") %}
+{% set button_link = button_link | default(value="") %}
+{% set button_text = button_text | default(value="") %}
+{% set image_src_right = image_src_right | default(value="") %}
+{% set image_alt_right = image_alt_right | default(value="") %}
+
+
   <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 -->
       <div class="max-w-md lg:max-w-xl text-left px-4 lg:px-16">
-        <img class="fade-in mb-4" width="30%" src="/images/tft_logo.png" alt="TF logo">
-        <h2 class="text-3xl font-bold tracking-tight text-white">ThreeFold Cloud</h2>
-        <dt class="text-lg font-normal text-white">Open-Source Cloud</dt>
-        <p class="mt-2 text-base text-white">ThreeFold is open for developers and system administrators. Deploy virtual machines, containers, Kubernetes clusters, web gateways, and more on top of a best-effort decentralized open source cloud.</p>
+        <img class="fade-in mb-4" width="30%" src="{{ image_src }}" alt="{{ image_alt }}">
+        <h2 class="text-3xl font-bold tracking-tight text-white">{{ title }}</h2>
+        <dt class="text-lg font-normal text-white">{{ subtitle }}</dt>
+        <p class="mt-2 text-base text-white">{{ description }}</p>
         <div class="mt-6 flex items-center gap-x-6">
-          <a href="https://manual.grid.tf/" class="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">Manual</a>
+          <a href="{{ button_link }}" class="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">{{ button_text }}</a>
         </div>
       </div>
 
       <!-- Image Column -->
       <div class="w-full lg:w-1/2 mt-12 lg:mt-0">
-        <img class="w-full h-auto rounded-md" src="/images/app.png" alt="App screenshot">
+        <img class="w-full h-auto rounded-md" src="{{ image_src_right }}" alt="{{ image_alt_right }}">
       </div>
-
     </div>
   </div>
-</div>
+
 
 
 <div class="mt-6 lg:mt-12 flex flex-col lg:flex-row items-center justify-center gap-x-6">