diff --git a/app/dwosi/components/dwosi-footer.tsx b/app/dwosi/components/dwosi-footer.tsx
index d15354e..efea2e9 100644
--- a/app/dwosi/components/dwosi-footer.tsx
+++ b/app/dwosi/components/dwosi-footer.tsx
@@ -1,3 +1,5 @@
+import Link from "next/link"
+
 import { DWOSI_LINKS } from "../data"
 
 const links = [
@@ -11,8 +13,19 @@ export function DwosiFooter() {
   return (
     <footer className="border-t">
       <div className="mx-auto flex max-w-6xl flex-col gap-4 px-4 py-8 sm:flex-row sm:items-center sm:justify-between sm:px-6">
-        <p className="text-sm text-muted-foreground">DWOSI is an initiative of Dev Weekends. Free for contributors.</p>
+        <p className="text-sm text-muted-foreground">
+          DWOSI is an initiative of{" "}
+          <Link href="/" className="underline underline-offset-4 can-hover:text-foreground">
+            Dev Weekends
+          </Link>
+          . Free for contributors.
+        </p>
         <ul className="flex flex-wrap gap-x-6 gap-y-2">
+          <li>
+            <Link href="/" className="dw-touch text-sm text-muted-foreground underline underline-offset-4 can-hover:text-foreground">
+              Dev Weekends home
+            </Link>
+          </li>
           {links.map((link) => (
             <li key={link.label}>
               <a
diff --git a/app/dwosi/components/dwosi-header.tsx b/app/dwosi/components/dwosi-header.tsx
index aea7548..b25d399 100644
--- a/app/dwosi/components/dwosi-header.tsx
+++ b/app/dwosi/components/dwosi-header.tsx
@@ -1,5 +1,5 @@
 import Link from "next/link"
-import { Menu } from "lucide-react"
+import { ArrowLeft, Menu } from "lucide-react"
 
 import { Button } from "@/components/ui/button"
 import {
@@ -32,6 +32,13 @@ export function DwosiHeader() {
 
         <div className="flex items-center gap-2">
           <nav aria-label="DWOSI" className="mr-2 hidden items-center gap-1 md:flex">
+            <Link
+              href="/"
+              className="dw-hit mr-2 inline-flex items-center gap-1.5 rounded-md border px-3 py-2 text-sm text-muted-foreground can-hover:bg-accent can-hover:text-foreground"
+            >
+              <ArrowLeft className="h-3.5 w-3.5" aria-hidden="true" />
+              Dev Weekends
+            </Link>
             {navItems.map((item) => (
               <Link
                 key={item.href}
@@ -54,6 +61,13 @@ export function DwosiHeader() {
               </Button>
             </DropdownMenuTrigger>
             <DropdownMenuContent align="end" sideOffset={8} className="dw-menu w-56 rounded-lg p-1">
+              <DropdownMenuItem asChild className={menuItemClass}>
+                <Link href="/" className="flex items-center gap-2">
+                  <ArrowLeft className="h-3.5 w-3.5" aria-hidden="true" />
+                  Dev Weekends home
+                </Link>
+              </DropdownMenuItem>
+              <DropdownMenuSeparator />
               {navItems.map((item) => (
                 <DropdownMenuItem key={item.href} asChild className={menuItemClass}>
                   <Link href={item.href}>{item.label}</Link>
diff --git a/components/home/data.ts b/components/home/data.ts
index fb25c64..7c38cf3 100644
--- a/components/home/data.ts
+++ b/components/home/data.ts
@@ -223,13 +223,14 @@ export const platforms = [
   { name: "Buildment", text: "Where our courses will live, MindMaster included. Coming soon.", href: LINKS.buildment },
 ]
 
-export const products: { name: string; tag: string; text: string; href: string | null }[] = [
+/** Products not live yet link to our GitHub and keep a Coming soon tag */
+export const products: { name: string; tag: string; text: string; href: string; soon?: boolean }[] = [
   { name: "Pathment", tag: "PLATFORM", text: "Runs our fellowships: clans, mentors, tasks and progress tracking.", href: LINKS.pathment },
-  { name: "Buildment", tag: "PLATFORM", text: "Our courses, MindMaster included, are coming here. Learn engineering by building.", href: LINKS.buildment },
+  { name: "Buildment", tag: "PLATFORM", text: "Our courses, MindMaster included, are coming here. Learn engineering by building.", href: LINKS.buildment ?? LINKS.github, soon: !LINKS.buildment },
   { name: "Community Cloud", tag: "FREE COMPUTE", text: "Shared Kubernetes from contributed compute for members' workloads.", href: "/dwosi#projects" },
   { name: "Inroad", tag: "CAREERS", text: "Finds companies that fit you and drafts a note to the person who can hire you.", href: LINKS.inroad },
   { name: "GoalSlot", tag: "PRODUCTIVITY", text: "Goals on your calendar, deep work on a timer, progress in reports.", href: LINKS.goalslot },
-  { name: "Content Control Platform", tag: "LEARNING", text: "Video and blog apps that guide each learner by background and goals.", href: null },
+  { name: "Content Control Platform", tag: "LEARNING", text: "Video and blog apps that guide each learner by background and goals.", href: LINKS.github, soon: true },
 ]
 
 export type Circle = { name: string; text: string; href: string | null; note?: string }
diff --git a/components/home/sections-mid.tsx b/components/home/sections-mid.tsx
index 541ab3d..8366d9a 100644
--- a/components/home/sections-mid.tsx
+++ b/components/home/sections-mid.tsx
@@ -105,12 +105,11 @@ export function Products() {
               <SmartLink
                 href={product.href}
                 className="flex h-full min-h-[170px] flex-col gap-1.5 rounded-[20px] p-6 hover:bg-[#FAFAFA]"
-                fallbackClassName="flex h-full min-h-[170px] flex-col gap-1.5 p-6"
               >
                 <span className="flex items-center justify-between gap-3">
                   <span className="text-lg font-semibold">{product.name}</span>
                   <span className="whitespace-nowrap rounded-full border border-[#D4D4D4] px-2 py-[3px] text-[11px] font-semibold tracking-[0.1em] text-[#5C5C5C]">
-                    {product.href ? product.tag : "COMING SOON"}
+                    {product.soon ? "COMING SOON" : product.tag}
                   </span>
                 </span>
                 <span className="text-sm leading-[1.55] text-[#5C5C5C]">{product.text}</span>