diff --git a/public/people/alex-van-le.jpg b/public/people/alex-van-le.jpg
new file mode 100644
index 0000000..c86c4e8
Binary files /dev/null and b/public/people/alex-van-le.jpg differ
diff --git a/public/people/alex-zhang.jpg b/public/people/alex-zhang.jpg
new file mode 100644
index 0000000..70dcb7c
Binary files /dev/null and b/public/people/alex-zhang.jpg differ
diff --git a/public/people/andrew-zacker.jpg b/public/people/andrew-zacker.jpg
new file mode 100644
index 0000000..10800b8
Binary files /dev/null and b/public/people/andrew-zacker.jpg differ
diff --git a/public/people/avery.jpg b/public/people/avery.jpg
new file mode 100644
index 0000000..f648b41
Binary files /dev/null and b/public/people/avery.jpg differ
diff --git a/public/people/ayush-soni.jpg b/public/people/ayush-soni.jpg
new file mode 100644
index 0000000..f4ea8e9
Binary files /dev/null and b/public/people/ayush-soni.jpg differ
diff --git a/public/people/bhanu.jpg b/public/people/bhanu.jpg
new file mode 100644
index 0000000..f534528
Binary files /dev/null and b/public/people/bhanu.jpg differ
diff --git a/public/people/chris-woggin.jpg b/public/people/chris-woggin.jpg
new file mode 100644
index 0000000..aeebbed
Binary files /dev/null and b/public/people/chris-woggin.jpg differ
diff --git a/public/people/david-ishg.jpg b/public/people/david-ishg.jpg
new file mode 100644
index 0000000..5caa390
Binary files /dev/null and b/public/people/david-ishg.jpg differ
diff --git a/public/people/dzhng.jpg b/public/people/dzhng.jpg
new file mode 100644
index 0000000..e40acec
Binary files /dev/null and b/public/people/dzhng.jpg differ
diff --git a/public/people/elitza.jpg b/public/people/elitza.jpg
new file mode 100644
index 0000000..86069f5
Binary files /dev/null and b/public/people/elitza.jpg differ
diff --git a/public/people/eugene.jpg b/public/people/eugene.jpg
new file mode 100644
index 0000000..b7e44b8
Binary files /dev/null and b/public/people/eugene.jpg differ
diff --git a/public/people/florin-pop.jpg b/public/people/florin-pop.jpg
new file mode 100644
index 0000000..03cd3f6
Binary files /dev/null and b/public/people/florin-pop.jpg differ
diff --git a/public/people/jonathan-parra.jpg b/public/people/jonathan-parra.jpg
new file mode 100644
index 0000000..c5c6b42
Binary files /dev/null and b/public/people/jonathan-parra.jpg differ
diff --git a/public/people/praneeth.jpg b/public/people/praneeth.jpg
new file mode 100644
index 0000000..fb3e3ed
Binary files /dev/null and b/public/people/praneeth.jpg differ
diff --git a/public/people/sai.jpg b/public/people/sai.jpg
new file mode 100644
index 0000000..df9297e
Binary files /dev/null and b/public/people/sai.jpg differ
diff --git a/public/people/steve-peak.jpg b/public/people/steve-peak.jpg
new file mode 100644
index 0000000..ff59db9
Binary files /dev/null and b/public/people/steve-peak.jpg differ
diff --git a/public/people/tibo-maker.jpg b/public/people/tibo-maker.jpg
new file mode 100644
index 0000000..e205ea8
Binary files /dev/null and b/public/people/tibo-maker.jpg differ
diff --git a/public/people/winston.jpg b/public/people/winston.jpg
new file mode 100644
index 0000000..7a7a06d
Binary files /dev/null and b/public/people/winston.jpg differ
diff --git a/public/people/yeonji.jpg b/public/people/yeonji.jpg
new file mode 100644
index 0000000..0979b04
Binary files /dev/null and b/public/people/yeonji.jpg differ
diff --git a/src/app/batch-1/hosts.tsx b/src/app/batch-1/hosts.tsx
new file mode 100644
index 0000000..598595b
--- /dev/null
+++ b/src/app/batch-1/hosts.tsx
@@ -0,0 +1,87 @@
+import Link from 'next/link'
+
+import { type Person } from '@/components/people-grid'
+import David from '@/public/people/david.jpg'
+import Phuc from '@/public/people/phuc.jpg'
+import Tony from '@/public/people/tony.jpg'
+import Travis from '@/public/people/travis.jpg'
+
+export const hosts: Person[] = [
+  {
+    name: 'Travis Fischer',
+    image: Travis,
+    url: 'https://x.com/transitive_bs',
+    twitter: 'https://x.com/transitive_bs',
+    github: 'https://github.com/transitive-bullshit',
+    linkedin: 'https://linkedin.com/in/fisch2',
+    description: (
+      <>
+        Founder of{' '}
+        <Link
+          href='https://github.com/transitive-bullshit/agentic'
+          target='_blank'
+          className='link'
+        >
+          Agentic
+        </Link>
+        . 2 exits. Prev{' '}
+        <Link href='https://hf0.com' target='_blank' className='link'>
+          HF0
+        </Link>
+        , Microsoft, and Amazon.
+      </>
+    )
+  },
+  {
+    name: 'Tony Dinh',
+    image: Tony,
+    url: 'https://x.com/tdinh_me',
+    twitter: 'https://x.com/tdinh_me',
+    github: 'https://github.com/trungdq88',
+    linkedin: 'https://www.linkedin.com/in/tdinh-me/',
+    description: (
+      <>
+        Making over $2M ARR solo while building{' '}
+        <Link href='https://typingmind.com' target='_blank' className='link'>
+          typingmind.com
+        </Link>{' '}
+        and{' '}
+        <Link href='https://devutils.com' target='_blank' className='link'>
+          devutils.com
+        </Link>
+        .
+      </>
+    )
+  },
+  {
+    name: 'Minh-Phuc Tran',
+    image: Phuc,
+    url: 'https://x.com/phuctm97',
+    twitter: 'https://x.com/phuctm97',
+    github: 'https://github.com/phuctm97',
+    linkedin: 'https://www.linkedin.com/in/phuctm97/',
+    description: (
+      <>
+        Built 8 startups in 12 months • Sold 3/8 startups • Building{' '}
+        <Link href='https://vibingbase.com' target='_blank' className='link'>
+          vibingbase.com
+        </Link>
+        .
+      </>
+    )
+  },
+  {
+    name: 'David Park',
+    image: David,
+    url: 'https://x.com/dayonefoundry',
+    twitter: 'https://x.com/dayonefoundry',
+    github: 'https://github.com/davidvypark',
+    linkedin: 'https://www.linkedin.com/in/david-park-69587844/',
+    description: (
+      <>
+        Built Raya & Kippo and then 120 other apps you&apos;ve never heard of
+        because they failed.
+      </>
+    )
+  }
+]
diff --git a/src/app/batch-1/mentors.tsx b/src/app/batch-1/mentors.tsx
new file mode 100644
index 0000000..1bd7a5c
--- /dev/null
+++ b/src/app/batch-1/mentors.tsx
@@ -0,0 +1,81 @@
+import Link from 'next/link'
+
+import type { Person } from '@/components/people-grid'
+import AyushSoni from '@/public/people/ayush-soni.jpg'
+import DavidZhang from '@/public/people/dzhng.jpg'
+import StevePeak from '@/public/people/steve-peak.jpg'
+import TiboMaker from '@/public/people/tibo-maker.jpg'
+
+export const mentors: Person[] = [
+  {
+    name: 'Tibo Maker',
+    image: TiboMaker,
+    url: 'https://x.com/tibo_maker',
+    twitter: 'https://x.com/tibo_maker',
+    github: 'https://github.com/tbll75',
+    linkedin: 'https://www.linkedin.com/in/tibo-the-maker/',
+    description: (
+      <>
+        Prolific portfolio of bootstrapped products; over $8M ARR; &gt;180k
+        followers on X. From France.
+      </>
+    )
+  },
+  {
+    name: 'David Zhang',
+    image: DavidZhang,
+    url: 'https://x.com/dzhng',
+    twitter: 'https://x.com/dzhng',
+    github: 'https://github.com/dzhng',
+    linkedin: 'https://www.linkedin.com/in/david-zhang-2902462a/',
+    description: (
+      <>
+        Prev company,{' '}
+        <Link
+          href='https://www.amitysolutions.com'
+          target='_blank'
+          className='link'
+        >
+          Amity
+        </Link>
+        , is worth &gt;$500M. Raised $4M for{' '}
+        <Link href='https://duet.so/' target='_blank' className='link'>
+          Duet
+        </Link>
+        . World-class AI eng &amp; serial founder. From SF.
+      </>
+    )
+  },
+  {
+    name: 'Steve Peak',
+    image: StevePeak,
+    url: 'https://x.com/iopeak',
+    twitter: 'https://x.com/iopeak',
+    github: 'https://github.com/stevepeak',
+    linkedin: 'https://www.linkedin.com/in/stevepeak23/',
+    description: (
+      <>
+        Formerly built &amp; sold{' '}
+        <Link href='https://about.codecov.io' target='_blank' className='link'>
+          codecov.io
+        </Link>{' '}
+        to Sentry as a solo founder for $10M. World-class AI eng &amp; serial
+        founder. From Colorado.
+      </>
+    )
+  },
+  {
+    name: 'Ayush Soni',
+    image: AyushSoni,
+    url: 'https://x.com/ayysoni',
+    twitter: 'https://x.com/ayysoni',
+    github: 'http://github.com/ayushsoni1001',
+    linkedin: 'https://www.linkedin.com/in/ayushsoni1001/',
+    description: (
+      <>
+        21yo with 5 exits. $450K+ ARR across multiple SaaS; top 100 Shopify app
+        builder in the world. From India.
+      </>
+    )
+  }
+]
diff --git a/src/app/batch-1/page.tsx b/src/app/batch-1/page.tsx
index c142cfa..c5bc8bb 100644
--- a/src/app/batch-1/page.tsx
+++ b/src/app/batch-1/page.tsx
@@ -4,10 +4,15 @@ import Link from 'next/link'
 
 import { Card } from '@/components/card'
 import { HeroButton } from '@/components/hero-button'
+import { PeopleGrid } from '@/components/people-grid'
 import { Sponsor } from '@/components/sponsor'
 import { AnimatedGradientBackground } from '@/components/ui/animated-gradient-background'
 import { WorldMap } from '@/components/ui/world-map'
 
+import { hosts } from './hosts'
+import { mentors } from './mentors'
+import { residents } from './residents'
+
 const dots: Array<{
   start: { lat: number; lng: number; label?: string }
   end: { lat: number; lng: number; label?: string }
@@ -91,42 +96,50 @@ export default function Batch0Page() {
     <>
       <AnimatedGradientBackground />
 
-      <section className='relative z-10 w-full flex flex-col gap-8 max-w-3xl flex-1 justify-center '>
-        <h2 className='text-center text-balance font-semibold text-3xl font-heading'>
-          HRG Batch 1
-        </h2>
-
-        <div className='flex flex-col gap-2'>
-          <p className='text-center text-pretty text-md leading-normal'>
-            Da Nang, Vietnam
-          </p>
-
-          <p className='text-center text-pretty text-sm italic leading-normal'>
-            May 1st – 31st, 2026
-          </p>
+      <section className='relative z-10 w-full flex flex-col gap-16 flex-1 justify-center '>
+        <div className='flex flex-col w-full gap-8 max-w-3xl justify-center'>
+          <h2 className='text-center text-balance font-semibold text-3xl font-heading'>
+            HRG Batch 1
+          </h2>
+
+          <div className='flex flex-col gap-2'>
+            <p className='text-center text-pretty text-md leading-normal'>
+              Da Nang, Vietnam
+            </p>
+
+            <p className='text-center text-pretty text-sm italic leading-normal'>
+              May 1st – 31st, 2026
+            </p>
+          </div>
+
+          <Card className='w-full'>
+            <WorldMap dots={dots} />
+          </Card>
+
+          <HeroButton heroVariant='red' className='self-center'>
+            <Link href='/'>stack.pop();</Link>
+          </HeroButton>
         </div>
 
-        <Card className='w-full'>
-          <WorldMap dots={dots} />
-        </Card>
+        <PeopleGrid title='Residents' people={residents} />
 
-        <HeroButton heroVariant='red'>
-          <Link href='/'>stack.pop();</Link>
-        </HeroButton>
+        <PeopleGrid title='Mentors' people={mentors} />
 
-        <SponsorSection />
+        <PeopleGrid title='Hosts' people={hosts} />
 
-        <HeroButton heroVariant='red'>
-          <Link href='/'>stack.pop();</Link>
-        </HeroButton>
+        <SponsorSection>
+          <HeroButton heroVariant='red'>
+            <Link href='/'>stack.pop();</Link>
+          </HeroButton>
+        </SponsorSection>
       </section>
     </>
   )
 }
 
-function SponsorSection() {
+function SponsorSection({ children }: { children?: React.ReactNode }) {
   return (
-    <section className='relative flex flex-col gap-12 py-16 px-4'>
+    <section className='relative flex flex-col gap-12 px-4 w-full max-w-3xl '>
       <h2 className='text-center text-balance text-4xl font-semibold leading-normal max-w-3xl'>
         Sponsors
       </h2>
@@ -166,6 +179,8 @@ function SponsorSection() {
           alt='OpenAI'
         />
       </div>
+
+      {children}
     </section>
   )
 }
diff --git a/src/app/batch-1/residents.tsx b/src/app/batch-1/residents.tsx
new file mode 100644
index 0000000..4bf9726
--- /dev/null
+++ b/src/app/batch-1/residents.tsx
@@ -0,0 +1,323 @@
+import Link from 'next/link'
+
+import type { Person } from '@/components/people-grid'
+import AlexVanLe from '@/public/people/alex-van-le.jpg'
+import AlexZhang from '@/public/people/alex-zhang.jpg'
+import AndrewZacker from '@/public/people/andrew-zacker.jpg'
+import Avery from '@/public/people/avery.jpg'
+import Bhanu from '@/public/people/bhanu.jpg'
+import ChrisWoggon from '@/public/people/chris-woggin.jpg'
+import DavidIshag from '@/public/people/david-ishg.jpg'
+import Elitza from '@/public/people/elitza.jpg'
+import Eugene from '@/public/people/eugene.jpg'
+import FlorinPop from '@/public/people/florin-pop.jpg'
+import JonathanParra from '@/public/people/jonathan-parra.jpg'
+import Praneeth from '@/public/people/praneeth.jpg'
+import Sai from '@/public/people/sai.jpg'
+import Winston from '@/public/people/winston.jpg'
+import Yeonji from '@/public/people/yeonji.jpg'
+
+export const residents: Person[] = [
+  {
+    name: 'Florin Pop',
+    image: FlorinPop,
+    url: 'https://x.com/florinpop17',
+    twitter: 'https://x.com/florinpop17',
+    github: 'https://github.com/florinpop17',
+    linkedin: 'https://www.linkedin.com/in/florinpop17',
+    description: (
+      <>
+        <Link href='https://x.com/florinpop17' target='_blank' className='link'>
+          200k followers on X
+        </Link>
+        ;{' '}
+        <Link
+          href='https://www.youtube.com/@florinpop'
+          target='_blank'
+          className='link'
+        >
+          170k followers on YT
+        </Link>
+        ; dev influencer &amp; indie hacker shipping like crazy. From Romania.
+      </>
+    )
+  },
+  {
+    name: 'Andrew Zacker',
+    image: AndrewZacker,
+    url: 'https://x.com/andrewzacker',
+    twitter: 'https://x.com/andrewzacker',
+    github: 'https://github.com/zacker-tech',
+    linkedin: 'https://www.linkedin.com/in/andrewzacker/',
+    description: (
+      <>
+        Indie hacker shipping like crazy alongside{' '}
+        <Link href='https://x.com/florinpop17' target='_blank' className='link'>
+          Florin Pop
+        </Link>
+        . From Poland.
+      </>
+    )
+  },
+  {
+    name: 'Eugene Zolotarenko',
+    image: Eugene,
+    url: 'https://x.com/eugZolotarenko',
+    twitter: 'https://x.com/eugZolotarenko',
+    github: 'https://github.com/eugeneZolotarenko',
+    linkedin: 'https://www.linkedin.com/in/eugenezolotarenko/',
+    description: (
+      <>
+        Co-Founder of{' '}
+        <Link href='https://www.outrank.so' target='_blank' className='link'>
+          Outrank
+        </Link>
+        , over $3M ARR, growing organic traffic on auto-pilot. Working with{' '}
+        <Link href='https://x.com/tibo_maker' target='_blank' className='link'>
+          Tibo Maker
+        </Link>
+        . From Poland.
+      </>
+    )
+  },
+  {
+    name: 'Avery',
+    image: Avery,
+    url: 'https://x.com/averycode',
+    twitter: 'https://x.com/averycode',
+    github: 'https://github.com/averygan',
+    linkedin: 'https://www.linkedin.com/in/averygan',
+    description: (
+      <>
+        Psych major turned indie hacker; building{' '}
+        <Link href='https://offscript.sh/' target='_blank' className='link'>
+          Offscript
+        </Link>{' '}
+        dev agency and{' '}
+        <Link href='https://rankd.dev' target='_blank' className='link'>
+          Rankd
+        </Link>
+        , ASO optimization. Ex Apple/HubSpot. From Singapore.
+      </>
+    )
+  },
+  {
+    name: 'Bhanu Teja P',
+    image: Bhanu,
+    url: 'https://x.com/pbteja1998',
+    twitter: 'https://x.com/pbteja1998',
+    github: 'https://github.com/pbteja1998',
+    linkedin: 'https://www.linkedin.com/in/pbteja1998/',
+    description: (
+      <>
+        Co-Founder of{' '}
+        <Link
+          href='https://missioncontrolhq.ai'
+          target='_blank'
+          className='link'
+        >
+          MissionControlHQ
+        </Link>{' '}
+        (17k MRR) and{' '}
+        <Link href='https://sitegpt.ai/' target='_blank' className='link'>
+          SiteGPT
+        </Link>{' '}
+        (19k MRR). 54k followers on X, serial founder with multiple exits. From
+        India.
+      </>
+    )
+  },
+  {
+    name: 'Sai Dheeraj P',
+    image: Sai,
+    url: 'https://x.com/saidheeraj_96',
+    twitter: 'https://x.com/saidheeraj_96',
+    linkedin: 'https://www.linkedin.com/in/dheerajpachipulusu/',
+    description: (
+      <>
+        Co-Founder of{' '}
+        <Link
+          href='https://missioncontrolhq.ai'
+          target='_blank'
+          className='link'
+        >
+          MissionControlHQ
+        </Link>{' '}
+        and{' '}
+        <Link href='https://sitegpt.ai/' target='_blank' className='link'>
+          SiteGPT
+        </Link>
+        . Serial founder with multiple exits. From India.
+      </>
+    )
+  },
+  {
+    name: 'Praneeth Pike',
+    image: Praneeth,
+    url: 'https://x.com/praneethpike',
+    twitter: 'https://x.com/praneethpike',
+    github: 'https://github.com/Praneeth-pike',
+    linkedin: 'https://www.linkedin.com/in/praneethykasula/',
+    description: (
+      <>
+        Founder of{' '}
+        <Link
+          href='https://www.rabbitholes.ai/'
+          target='_blank'
+          className='link'
+        >
+          RabbitHoles.ai
+        </Link>
+        , a canvas-based UX for genAI with over $100k in revenue. Also runs a
+        design agency. From India.
+      </>
+    )
+  },
+  {
+    name: 'Winston Iskandar',
+    image: Winston,
+    url: 'https://x.com/WinstonIsk',
+    twitter: 'https://x.com/WinstonIsk',
+    github: 'https://github.com/winstoniskandar',
+    linkedin: 'https://www.linkedin.com/in/winstoniskandar',
+    description: (
+      <>
+        Stanford CS student &amp; Co-Founder of{' '}
+        <Link href='https://similate.ai/' target='_blank' className='link'>
+          Similate.ai
+        </Link>
+        , a simulation platform for human behavior. From SF.
+      </>
+    )
+  },
+  {
+    name: 'Alex Zhang',
+    image: AlexZhang,
+    url: 'https://x.com/alexzhang104',
+    twitter: 'https://x.com/alexzhang104',
+    linkedin: 'https://www.linkedin.com/in/zhangalexanderx',
+    description: (
+      <>
+        Stanford CS student &amp; Co-Founder of{' '}
+        <Link href='https://similate.ai/' target='_blank' className='link'>
+          Similate.ai
+        </Link>
+        , a simulation platform for human behavior. From SF.
+      </>
+    )
+  },
+  {
+    name: 'Elitza Vasileva',
+    image: Elitza,
+    url: 'https://x.com/ElitzaVasileva',
+    twitter: 'https://x.com/ElitzaVasileva',
+    github: 'https://github.com/elitza-vasileva',
+    linkedin: 'https://www.linkedin.com/in/elitza-vasileva/',
+    description: (
+      <>
+        Founder of{' '}
+        <Link href='https://own.page' target='_blank' className='link'>
+          own.page
+        </Link>
+        , a link-in-bio / personal website builder with over 3k users and
+        growing fast. From Vienna, Austria.
+      </>
+    )
+  },
+  {
+    name: 'Alexander Van Le',
+    image: AlexVanLe,
+    url: 'https://x.com/qwertyu_alex',
+    twitter: 'https://x.com/qwertyu_alex',
+    github: 'https://github.com/qwertyu-alex',
+    linkedin: 'https://www.linkedin.com/in/alexandervle/',
+    description: (
+      <>
+        Co-Founder of{' '}
+        <Link href='https://www.starpop.ai/' target='_blank' className='link'>
+          Starpop
+        </Link>
+        , AI UGC videos, $15k MRR. From Denmark.
+      </>
+    )
+  },
+  {
+    name: 'David Ishag',
+    image: DavidIshag,
+    url: 'https://x.com/david_ishg',
+    twitter: 'https://x.com/david_ishg',
+    github: 'https://github.com/Davidshag',
+    linkedin: 'https://www.linkedin.com/in/david-ishag-a18782352/',
+    description: (
+      <>
+        Co-Founder of{' '}
+        <Link href='https://www.starpop.ai/' target='_blank' className='link'>
+          Starpop
+        </Link>
+        , AI UGC videos, $15k MRR. From Switzerland.
+      </>
+    )
+  },
+  {
+    name: 'Christopher Woggon',
+    image: ChrisWoggon,
+    url: 'https://x.com/chrissyinspace',
+    twitter: 'https://x.com/chrissyinspace',
+    github: 'https://github.com/chrissy0',
+    linkedin: 'https://www.linkedin.com/in/christopher-woggon-3b2774271/',
+    description: (
+      <>
+        Building{' '}
+        <Link
+          href='https://www.tinylaunch.com/'
+          target='_blank'
+          className='link'
+        >
+          TinyLaunch
+        </Link>
+        , a launch platform for indie products, $42k revenue so far. Also
+        building a portfolio of small bets. From Germany.
+      </>
+    )
+  },
+  {
+    name: 'Yeonji',
+    image: Yeonji,
+    url: 'https://x.com/yeonjidev',
+    twitter: 'https://x.com/yeonjidev',
+    github: 'https://github.com/oyaa52',
+    linkedin:
+      'https://www.linkedin.com/in/%EC%97%B0%EC%A7%80-%EC%9E%84-396570223/',
+    description: (
+      <>
+        Building a portfolio of small bets alongside{' '}
+        <Link
+          href='https://x.com/chrissyinspace'
+          target='_blank'
+          className='link'
+        >
+          Christopher Woggon
+        </Link>
+        . From South Korea.
+      </>
+    )
+  },
+  {
+    name: 'Jonathan Parra',
+    image: JonathanParra,
+    url: 'https://x.com/jondeparra',
+    twitter: 'https://x.com/jondeparra',
+    github: 'https://github.com/jondeparra',
+    linkedin: 'https://www.linkedin.com/in/jondeparra/',
+    description: (
+      <>
+        The Paywall guy. Prev{' '}
+        <Link href='https://superwall.com' target='_blank' className='link'>
+          Superwall
+        </Link>
+        (YC S21). Agency building mobile apps including Prove It ($600k MRR),
+        and currently a Pokémon Go-like app for bird watchers. From Las Vegas.
+      </>
+    )
+  }
+]
diff --git a/src/app/home/team-section.tsx b/src/app/home/team-section.tsx
index c22d00b..e4515bb 100644
--- a/src/app/home/team-section.tsx
+++ b/src/app/home/team-section.tsx
@@ -1,16 +1,12 @@
-import Image from 'next/image'
 import Link from 'next/link'
 
-import { Card } from '@/components/card'
-import { GitHubIcon } from '@/icons/github'
-import { LinkedInIcon } from '@/icons/linkedin'
-import { TwitterIcon } from '@/icons/twitter'
+import { PeopleGrid, type Person } from '@/components/people-grid'
 import David from '@/public/people/david.jpg'
 import Phuc from '@/public/people/phuc.jpg'
 import Tony from '@/public/people/tony.jpg'
 import Travis from '@/public/people/travis.jpg'
 
-const people = [
+const people: Person[] = [
   {
     name: 'Travis Fischer',
     image: Travis,
@@ -45,7 +41,7 @@ const people = [
     linkedin: 'https://www.linkedin.com/in/tdinh-me/',
     description: (
       <>
-        Making over $1M ARR solo while building{' '}
+        Making over $2M ARR solo while building{' '}
         <Link href='https://typingmind.com' target='_blank' className='link'>
           typingmind.com
         </Link>{' '}
@@ -91,75 +87,5 @@ const people = [
 ]
 
 export function TeamSection() {
-  return (
-    <section className='relative z-10 flex flex-col gap-16 mb-16' id='team'>
-      <h2 className='text-center text-balance text-4xl font-semibold leading-normal max-w-3xl'>
-        Led by world-class hackers
-      </h2>
-
-      <div className='grid grid-cols-1 gap-8 sm:grid-cols-2 xl:grid-cols-4'>
-        {people.map((person) => (
-          <Card
-            key={person.name}
-            className='group justify-self-center w-full grid grid-cols-1 max-w-xs'
-          >
-            <div className='flex flex-col gap-4 color-card-foreground items-center p-6'>
-              <Link href={person.url} target='_blank' rel='noopener noreferrer'>
-                <Image
-                  src={person.image}
-                  alt={person.name}
-                  width={person.image.width}
-                  height={person.image.height}
-                  blurDataURL={person.image.blurDataURL}
-                  placeholder='blur'
-                  className='rounded-full w-24 h-24 border-2 border-muted-foreground hover:border-foreground shadow-sm'
-                />
-              </Link>
-
-              <h3 className='text-center text-balance text-xl font-semibold leading-normal max-w-3xl'>
-                {person.name}
-              </h3>
-
-              <div className='flex flex-row gap-4 items-center'>
-                <Link
-                  href={person.twitter}
-                  target='_blank'
-                  rel='noopener noreferrer'
-                  className='text-muted-foreground hover:text-card-foreground transition-colors'
-                >
-                  <TwitterIcon className='w-4 h-4' />
-                </Link>
-
-                {person.github && (
-                  <Link
-                    href={person.github}
-                    target='_blank'
-                    rel='noopener noreferrer'
-                    className='text-muted-foreground hover:text-card-foreground transition-colors'
-                  >
-                    <GitHubIcon className='w-4 h-4' />
-                  </Link>
-                )}
-
-                {person.linkedin && (
-                  <Link
-                    href={person.linkedin}
-                    target='_blank'
-                    rel='noopener noreferrer'
-                    className='text-muted-foreground hover:text-card-foreground transition-colors'
-                  >
-                    <LinkedInIcon className='w-4 h-4' />
-                  </Link>
-                )}
-              </div>
-
-              <p className='text-center text-balance text-sm leading-normal'>
-                {person.description}
-              </p>
-            </div>
-          </Card>
-        ))}
-      </div>
-    </section>
-  )
+  return <PeopleGrid title='Led by world-class hackers' people={people} />
 }
diff --git a/src/components/people-grid.tsx b/src/components/people-grid.tsx
new file mode 100644
index 0000000..6b65afc
--- /dev/null
+++ b/src/components/people-grid.tsx
@@ -0,0 +1,106 @@
+import Image, { type StaticImageData } from 'next/image'
+import Link from 'next/link'
+
+import { Card } from '@/components/card'
+import { GitHubIcon } from '@/icons/github'
+import { LinkedInIcon } from '@/icons/linkedin'
+import { TwitterIcon } from '@/icons/twitter'
+import { cn } from '@/lib/utils'
+
+export interface Person {
+  name: string
+  image: StaticImageData
+  url: string
+  twitter: string
+  github?: string
+  linkedin?: string
+  description: React.ReactNode
+}
+
+export function PeopleGrid({
+  title,
+  people,
+  className,
+  children
+}: {
+  title: string
+  people: Person[]
+  className?: string
+  children?: React.ReactNode
+}) {
+  return (
+    <section
+      className={cn('relative z-10 flex flex-col gap-16 mb-16', className)}
+    >
+      <h2 className='text-center text-balance text-4xl font-semibold leading-normal max-w-3xl'>
+        {title}
+      </h2>
+
+      <div className='grid grid-cols-1 gap-8 sm:grid-cols-2 xl:grid-cols-4 align-items-stretch'>
+        {people.map((person) => (
+          <Card
+            key={person.name}
+            className='group justify-self-center w-full grid grid-cols-1 max-w-xs'
+          >
+            <div className='flex flex-col gap-4 color-card-foreground items-center p-6'>
+              <Link href={person.url} target='_blank' rel='noopener noreferrer'>
+                <Image
+                  src={person.image}
+                  alt={person.name}
+                  width={person.image.width}
+                  height={person.image.height}
+                  blurDataURL={person.image.blurDataURL}
+                  placeholder='blur'
+                  className='rounded-full w-24 h-24 border-2 border-muted-foreground hover:border-foreground shadow-sm'
+                />
+              </Link>
+
+              <h3 className='text-center text-balance text-xl font-semibold leading-normal max-w-3xl'>
+                {person.name}
+              </h3>
+
+              <div className='flex flex-row gap-4 items-center'>
+                <Link
+                  href={person.twitter}
+                  target='_blank'
+                  rel='noopener noreferrer'
+                  className='text-muted-foreground hover:text-card-foreground transition-colors'
+                >
+                  <TwitterIcon className='w-4 h-4' />
+                </Link>
+
+                {person.github && (
+                  <Link
+                    href={person.github}
+                    target='_blank'
+                    rel='noopener noreferrer'
+                    className='text-muted-foreground hover:text-card-foreground transition-colors'
+                  >
+                    <GitHubIcon className='w-4 h-4' />
+                  </Link>
+                )}
+
+                {person.linkedin && (
+                  <Link
+                    href={person.linkedin}
+                    target='_blank'
+                    rel='noopener noreferrer'
+                    className='text-muted-foreground hover:text-card-foreground transition-colors'
+                  >
+                    <LinkedInIcon className='w-4 h-4' />
+                  </Link>
+                )}
+              </div>
+
+              <p className='text-center text-balance text-sm leading-normal'>
+                {person.description}
+              </p>
+            </div>
+          </Card>
+        ))}
+      </div>
+
+      {children}
+    </section>
+  )
+}
diff --git a/src/components/sponsor.tsx b/src/components/sponsor.tsx
index 8cd7157..1a0f00a 100644
--- a/src/components/sponsor.tsx
+++ b/src/components/sponsor.tsx
@@ -19,7 +19,7 @@ export function Sponsor({
     <Link
       href={href}
       target='_blank'
-      className='flex flex-col items-center justify-center'
+      className='flex flex-col items-center justify-center transition-[filter] hover:brightness-75'
     >
       <img
         src={src}