diff --git a/.gitignore b/.gitignore
index a5c24d9..6f13da8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ yarn-error.log*
 .env*.local
 
 .vercel
+*.lock
diff --git a/app/e-lab/[id]/page.tsx b/app/e-lab/[id]/page.tsx
index 90283b2..c60ed97 100644
--- a/app/e-lab/[id]/page.tsx
+++ b/app/e-lab/[id]/page.tsx
@@ -1,12 +1,12 @@
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
-import {faInstagram, faLinkedin, faXTwitter, faYoutube} from "@fortawesome/free-brands-svg-icons";
-import {faArrowLeft, faEnvelope, faLink} from "@fortawesome/free-solid-svg-icons";
-import {alumni, Person, team} from "../../../data/e-lab";
+import {faArrowLeft} from "@fortawesome/free-solid-svg-icons";
+import {alumni, Person, team} from "@data/e-lab";
 import Link from "next/link";
 import NotFound from "next/dist/client/components/not-found-error";
 import Section from "@components/ui/Section";
 import Image from "next/image";
 import {ProfilePage, WithContext} from "schema-dts";
+import SocialMediaLinks from "@components/SocialMediaLinks";
 
 export function generateStaticParams() {
     return team.map((person) => ({
@@ -47,7 +47,7 @@ export default function Page({params: {id}}: { params: { id: string } }) {
             familyName: person.lastName,
             description: person.description,
             image: 'https://www.tum-ai.com' + person.imgSrc,
-            email: person.email,
+            email: person.socialMedia.email,
             worksFor: {
                 '@type': 'EmployeeRole',
                 roleName: person.role,
@@ -67,11 +67,11 @@ export default function Page({params: {id}}: { params: { id: string } }) {
             },
             url: 'https://www.tum-ai.com/e-lab/' + person.id,
             sameAs: [
-                person.linkedin,
-                person.x ? person.x : "",
-                person.instagram ? person.instagram : "",
-                person.youtube ? person.youtube : "",
-                person.website ? person.website : "",
+                person.socialMedia.linkedin,
+                person.socialMedia.x ? person.socialMedia.x : "",
+                person.socialMedia.instagram ? person.socialMedia.instagram : "",
+                person.socialMedia.youtube ? person.socialMedia.youtube : "",
+                person.socialMedia.website ? person.socialMedia.website : "",
             ],
         },
     }
@@ -118,72 +118,15 @@ export default function Page({params: {id}}: { params: { id: string } }) {
                                         {person?.role}
                                     </p>
 
-                                    <div className="sm:ml-4 sm:pl-4 sm:border-l sm:border-gray-300 mt-4 sm:mt-0">
-                                        <h2 className="sr-only">Social Media Links</h2>
-                                        <div className="flex items-center">
-                                            <div className="space-x-4">
-                                                <Link href={person?.linkedin} target="_blank" rel="me">
-                                                    <FontAwesomeIcon
-                                                        icon={faLinkedin}
-                                                        size="lg"
-                                                        className="duration-500 hover:text-yellow-500"
-                                                        title="LinkedIn Profile"
-                                                    />
-                                                </Link>
-                                                {person.x ? (
-                                                    <Link href={person.x} target="_blank" rel="me">
-                                                        <FontAwesomeIcon
-                                                            icon={faXTwitter}
-                                                            size="lg"
-                                                            className="duration-500 hover:text-yellow-500"
-                                                            title="X (former Twitter) Account"
-                                                        />
-                                                    </Link>
-                                                ) : null}
-                                                {person.instagram ? (
-                                                    <Link href={person.instagram} target="_blank" rel="me">
-                                                        <FontAwesomeIcon
-                                                            icon={faInstagram}
-                                                            size="lg"
-                                                            className="duration-500 hover:text-yellow-500"
-                                                            title="Instagram Page"
-                                                        />
-                                                    </Link>
-                                                ) : null}
-                                                {person.youtube ? (
-                                                    <Link href={person.youtube} target="_blank" rel="me">
-                                                        <FontAwesomeIcon
-                                                            icon={faYoutube}
-                                                            size="lg"
-                                                            className="duration-500 hover:text-yellow-500"
-                                                            title="YouTube Channel"
-                                                        />
-                                                    </Link>
-                                                ) : null}
-                                                {person.website ? (
-                                                    <Link href={person.website} target="_blank" rel="me">
-                                                        <FontAwesomeIcon
-                                                            icon={faLink}
-                                                            size="lg"
-                                                            className="duration-500 hover:text-yellow-500"
-                                                            title="Personal Website"
-                                                        />
-                                                    </Link>
-                                                ) : null}
-                                                {person.email ? (
-                                                    <Link href={`mailto:${person.email}`} rel="me">
-                                                        <FontAwesomeIcon
-                                                            icon={faEnvelope}
-                                                            size="lg"
-                                                            className="duration-500 hover:text-yellow-500"
-                                                            title="Send E-Mail"
-                                                        />
-                                                    </Link>
-                                                ) : null}
-                                            </div>
+                                <div className="sm:ml-4 sm:pl-4 sm:border-l sm:border-gray-300 mt-4 sm:mt-0">
+                                    <h2 className="sr-only">Social Media Links</h2>
+                                    <div className="flex items-center">
+                                        <div className="space-x-4">
+                                            <SocialMediaLinks socialMedia={person.socialMedia} iconClassNames={"duration-500 hover:text-yellow-500"}/>
                                         </div>
                                     </div>
                                 </div>
+                            </div>
 
                                 <div className="mt-4 space-y-6">
                                     <p className="text-base whitespace-pre-wrap">
@@ -193,97 +136,40 @@ export default function Page({params: {id}}: { params: { id: string } }) {
                             </section>
                         </div>
 
-                        {/* Person image */}
-                        <div className="mt-10 lg:mt-0 lg:col-start-2 lg:row-span-2 lg:self-center">
-                            <div className="aspect-w-1 aspect-h-1 rounded-lg overflow-hidden">
-                                <Image
-                                    src={person?.imgSrc}
-                                    width={0}
-                                    height={0}
-                                    sizes="100vw"
-                                    alt={person?.imgAlt}
-                                    className="w-full h-full object-center object-cover"
-                                />
-                            </div>
+                    {/* Person image */}
+                    <div className="mt-10 lg:mt-0 lg:col-start-2 lg:row-span-2 lg:self-center">
+                        <div className="aspect-w-1 aspect-h-1 rounded-lg overflow-hidden">
+                            <Image
+                                src={person?.imgSrc}
+                                width={0}
+                                height={0}
+                                sizes="100vw"
+                                alt={person?.imgAlt}
+                                className="w-full h-full object-center object-cover"
+                            />
                         </div>
                     </div>
                 </div>
-                <div
-                    className="group relative bg-white border border-gray-200 rounded-lg flex flex-col overflow-hidden mt-4 max-w-2xl mx-auto lg:max-w-7xl">
-                    <div className="flex-1 p-4 space-y-2 flex flex-col">
-                        <div className="flex flex-col md:flex-row md:justify-between">
-                            <div>
-                                <h3 className="text-m font-medium text-gray-900">
-                                    {person.firstName} {person.lastName}
-                                </h3>
-                                <p className="text-sm text-gray-500">
-                                    {person.role}
-                                </p>
-                            </div>
-                            <div className="space-x-4 mt-2 md:mt-0">
-                                <Link href={person?.linkedin} target="_blank">
-                                    <FontAwesomeIcon
-                                        icon={faLinkedin}
-                                        size="lg"
-                                        className="text-black duration-500 hover:text-yellow-500"
-                                        title="LinkedIn Profile"
-                                    />
-                                </Link>
-                                {person.x ? (
-                                    <Link href={person.x} target="_blank">
-                                        <FontAwesomeIcon
-                                            icon={faXTwitter}
-                                            size="lg"
-                                            className="text-black duration-500 hover:text-yellow-500"
-                                            title="X (former Twitter) Account"
-                                        />
-                                    </Link>
-                                ) : null}
-                                {person.instagram ? (
-                                    <Link href={person.instagram} target="_blank">
-                                        <FontAwesomeIcon
-                                            icon={faInstagram}
-                                            size="lg"
-                                            className="text-black duration-500 hover:text-yellow-500"
-                                            title="Instagram Page"
-                                        />
-                                    </Link>
-                                ) : null}
-                                {person.youtube ? (
-                                    <Link href={person.youtube} target="_blank">
-                                        <FontAwesomeIcon
-                                            icon={faYoutube}
-                                            size="lg"
-                                            className="text-black duration-500 hover:text-yellow-500"
-                                            title="YouTube Channel"
-                                        />
-                                    </Link>
-                                ) : null}
-                                {person.website ? (
-                                    <Link href={person.website} target="_blank">
-                                        <FontAwesomeIcon
-                                            icon={faLink}
-                                            size="lg"
-                                            className="text-black duration-500 hover:text-yellow-500"
-                                            title="Personal Website"
-                                        />
-                                    </Link>
-                                ) : null}
-                                {person.email ? (
-                                    <Link href={`mailto:${person.email}`}>
-                                        <FontAwesomeIcon
-                                            icon={faEnvelope}
-                                            size="lg"
-                                            className="text-black duration-500 hover:text-yellow-500"
-                                            title="Send E-Mail"
-                                        />
-                                    </Link>
-                                ) : null}
-                            </div>
+            </div>
+            <div
+                className="group relative bg-white border border-gray-200 rounded-lg flex flex-col overflow-hidden mt-4 max-w-2xl mx-auto lg:max-w-7xl">
+                <div className="flex-1 p-4 space-y-2 flex flex-col">
+                    <div className="flex flex-col md:flex-row md:justify-between">
+                        <div>
+                            <h3 className="text-m font-medium text-gray-900">
+                                {person.firstName} {person.lastName}
+                            </h3>
+                            <p className="text-sm text-gray-500">
+                                {person.role}
+                            </p>
+                        </div>
+                        <div className="space-x-4 mt-2 md:mt-0">
+                            <SocialMediaLinks socialMedia={person.socialMedia} iconClassNames={"text-black duration-500 hover:text-yellow-500"} />
                         </div>
                     </div>
                 </div>
-            </Section>
+            </div>
+        </Section>
         </div>
     );
 }
diff --git a/app/e-lab/page.tsx b/app/e-lab/page.tsx
index fbd71f6..fcea370 100644
--- a/app/e-lab/page.tsx
+++ b/app/e-lab/page.tsx
@@ -42,72 +42,72 @@ export const metadata: Metadata = {
 };
 
 export default function Page() {
-
-  const jsonLd: WithContext<Organization> = {
-    '@context': 'https://schema.org',
-    '@type': 'Organization',
-    name: 'Venture Department',
-    alternateName: [
-      'AI Entrepreneurship Lab',
-      'AI E-Lab',
-      'AI E-Lab by TUM.ai',
-      'AI Entrepreneurship Lab by TUM.ai',
-    ],
-    description: 'The Venture Department is the entrepreneurial arm of TUM.ai and organizes the AI Entrepreneurship Lab, a 14-week equity-free AI startup incubator.',
-    url: 'https://www.tum-ai.com/e-lab',
-    email: 'venture@tum-ai.com',
-    sameAs: [
-      'https://www.startbase.de/organization/ai-e-lab/',
-      'https://www.startup-insider.com/investor/ai-e-lab-by-tum-ai',
-      'https://www.munich-startup.de/startups/tum-ai-entrepreneurship-lab/',
-    ],
-    parentOrganization: {
-      '@type': 'Organization',
-      name: 'TUM.ai',
-      legalName: 'TUM.ai e.V.',
-      alternateName: 'TUM.ai Student Initiative',
-      url: 'https://www.tum-ai.com',
-      logo: 'https://upload.wikimedia.org/wikipedia/commons/a/a2/TUM.ai_Logo_Blue_%26_Violet.svg',
-      email: 'contact@tum-ai.com',
-    },
-    contactPoint: {
-      '@type': 'ContactPoint',
-      email: 'venture@tum-ai.com',
-      contactType: 'Venture Department',
-    },
-    employee: {
-      '@type': 'EmployeeRole',
-      roleName: 'Head of Venture Department',
-      employee: {
-        '@type': 'Person',
-        name: 'Laurenz Sommerlad',
-        identifier: 'laurenz-sommerlad',
-        email: 'laurenz.sommerlad@tum-ai.com',
-        url: 'https://www.tum-ai.com/e-lab/laurenz-sommerlad',
+    const jsonLd: WithContext<Organization> = {
+        '@context': 'https://schema.org',
+        '@type': 'Organization',
+        name: 'Venture Department',
+        alternateName: [
+            'AI Entrepreneurship Lab',
+            'AI E-Lab',
+            'AI E-Lab by TUM.ai',
+            'AI Entrepreneurship Lab by TUM.ai',
+        ],
+        description: 'The Venture Department is the entrepreneurial arm of TUM.ai and organizes the AI Entrepreneurship Lab, a 14-week equity-free AI startup incubator.',
+        url: 'https://www.tum-ai.com/e-lab',
+        email: 'venture@tum-ai.com',
         sameAs: [
-          'https://laurenzsommerlad.com',
-          'https://www.linkedin.com/in/laurenzsommerlad/',
+            'https://www.startbase.de/organization/ai-e-lab/',
+            'https://www.startup-insider.com/investor/ai-e-lab-by-tum-ai',
+            'https://www.munich-startup.de/startups/tum-ai-entrepreneurship-lab/',
         ],
+        parentOrganization: {
+            '@type': 'Organization',
+            name: 'TUM.ai',
+            legalName: 'TUM.ai e.V.',
+            alternateName: 'TUM.ai Student Initiative',
+            url: 'https://www.tum-ai.com',
+            logo: 'https://upload.wikimedia.org/wikipedia/commons/a/a2/TUM.ai_Logo_Blue_%26_Violet.svg',
+            email: 'contact@tum-ai.com',
+        },
         contactPoint: {
-          '@type': 'ContactPoint',
-          email: 'laurenz.sommerlad@tum-ai.com',
-          contactType: 'Head of Venture Department',
-        }
-      },
-    },
-  }
+            '@type': 'ContactPoint',
+            email: 'venture@tum-ai.com',
+            contactType: 'Venture Department',
+        },
+        employee: {
+            '@type': 'EmployeeRole',
+            roleName: 'Head of Venture Department',
+            employee: {
+                '@type': 'Person',
+                name: 'Laurenz Sommerlad',
+                identifier: 'laurenz-sommerlad',
+                email: 'laurenz.sommerlad@tum-ai.com',
+                url: 'https://www.tum-ai.com/e-lab/laurenz-sommerlad',
+                sameAs: [
+                    'https://laurenzsommerlad.com',
+                    'https://www.linkedin.com/in/laurenzsommerlad/',
+                ],
+                contactPoint: {
+                    '@type': 'ContactPoint',
+                    email: 'laurenz.sommerlad@tum-ai.com',
+                    contactType: 'Head of Venture Department',
+                }
+            },
+        },
+    }
+
 
   return (
       <>
-        <section>
-          {/* Add JSON-LD to your page */}
-          <script
-              type="application/ld+json"
-              dangerouslySetInnerHTML={{__html: JSON.stringify(jsonLd)}}
-          />
-        </section>
-        <Hero/>
-        {/*
+          <section>
+              {/* Add JSON-LD to your page */}
+              <script
+                  type="application/ld+json"
+                  dangerouslySetInnerHTML={{__html: JSON.stringify(jsonLd)}}
+              />
+          </section>
+      <Hero />
+      {/* {
       <Section className="items-center justify-center bg-purple-950 text-white">
         <h2 className="mb-8 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-center text-3xl font-semibold uppercase tracking-widest text-transparent sm:text-5xl">
           AI E-Lab Final Pitch Event
@@ -134,38 +134,38 @@ export default function Page() {
           </div>
         </div>
       </Section>
-      */}
-        <Section className="bg-purple-950 text-white">
-          <div className="mb-8 sm:mb-16 md:w-3/5 lg:mb-32">
-            <h2 className="mb-12 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-5xl font-semibold uppercase text-transparent">
-              What is the AI E-Lab?
-            </h2>
-            <p className="text-2xl">
+     } */}
+      <Section className="bg-purple-950 text-white">
+        <div className="mb-8 sm:mb-16 md:w-3/5 lg:mb-32">
+          <h2 className="mb-12 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-5xl font-semibold uppercase text-transparent">
+            What is the AI E-Lab?
+          </h2>
+          <p className="text-2xl">
             <span className="text-yellow-500">
               The AI Entrepreneurship Lab is the Launchpad for your AI ventures,
             </span>{" "}
-              a 3-months founding journey for curious and driven individuals. We
-              provide you with relevant know-how, a team, and support to lay the
-              foundation for your own AI startup.
-            </p>
-          </div>
+            a 3-months founding journey for curious and driven individuals. We
+            provide you with relevant know-how, a team, and support to lay the
+            foundation for your own AI startup.
+          </p>
+        </div>
 
-          <div className="flex items-end justify-end">
-            <div className="flex w-full flex-col items-center md:w-3/5">
-              <h3 className="mb-4 text-4xl font-semibold text-yellow-500">
-                Inside the E-Lab: A Founder&apos;s Journey
-              </h3>
-              <iframe
-                  src="https://www.youtube.com/embed/DPJGAG9blO8?si=jDCtCvf6sVZRX69X"
-                  style={{aspectRatio: 16 / 9}}
-                  className="w-full"
-                  title="YouTube video player"
-                  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-                  allowFullScreen
-              />
-            </div>
+        <div className="flex items-end justify-end">
+          <div className="flex w-full flex-col items-center md:w-3/5">
+            <h3 className="mb-4 text-4xl font-semibold text-yellow-500">
+              Inside the E-Lab: A Founder&apos;s Journey
+            </h3>
+            <iframe
+              src="https://www.youtube.com/embed/DPJGAG9blO8?si=jDCtCvf6sVZRX69X"
+              style={{ aspectRatio: 16 / 9 }}
+              className="w-full"
+              title="YouTube video player"
+              allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+              allowFullScreen
+            />
           </div>
-        </Section>
+        </div>
+      </Section>
 
       <Section className="bg-purple-950 text-white">
                 <h1 className="mb-12 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-5xl font-semibold uppercase text-transparent">
@@ -197,6 +197,14 @@ export default function Page() {
                   <CarouselPrevious />
                   <CarouselNext />
                 </Carousel>
+                <div className="mt-16 text-center">
+                <Link
+                    className="inline-block rounded-full border-2 border-yellow-500 p-4 text-center font-bold text-yellow-500 transition-colors duration-300 hover:bg-yellow-500 hover:text-purple-950"
+                    href="/e-lab/startuplist"
+                >
+                    See all E-Lab Startups
+                </Link>
+            </div>
             </Section>
 
         <Section className="bg-purple-950 text-white">
@@ -209,247 +217,237 @@ export default function Page() {
             <span>you can build something great!</span>
           </p>
 
-          <div className="my-12 grid gap-16 md:grid-cols-2">
-            <p>
-              Entrepreneurship means change and we believe that everyone is
-              qualified to become an{" "}
-              <span className="text-red-500">entrepreneur</span>. Think about your
-              last big achievement, your perseverance over hurdles and what it
-              took to succeed - you already proved that you are a real
-              changemaker.
-            </p>
+          <p>
+            Are you ready for your next step? Great. With our AI
+            Entrepreneurship Lab we aim at making the founding of AI{" "}
+            <span className="text-red-500">startups </span>
+            accessible to everyone, including you. Bring your motivation and
+            dedication, and we’ll provide the rest, striving to make founding as
+            easy as possible for you.
+          </p>
 
-            <p>
-              Are you ready for your next step? Great. With our AI
-              Entrepreneurship Lab we aim at making the founding of AI{" "}
-              <span className="text-red-500">startups </span>
-              accessible to everyone, including you. Bring your motivation and
-              dedication, and we’ll provide the rest, striving to make founding as
-              easy as possible for you.
-            </p>
-          </div>
+        <div className="mt-16">
+          <SnapSlider cards={testimonials} />
+        </div>
+      </Section>
 
-          <div className="mt-16">
-            <SnapSlider cards={testimonials}/>
-          </div>
-        </Section>
+      <Section className="bg-purple-950 text-white">
+        <h2 className="mb-16 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-center text-3xl font-semibold uppercase tracking-widest text-transparent sm:text-5xl">
+          Last AI E-Lab in numbers
+        </h2>
 
-        <Section className="bg-purple-950 text-white">
-          <h2 className="mb-16 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-center text-3xl font-semibold uppercase tracking-widest text-transparent sm:text-5xl">
-            Last AI E-Lab in numbers
-          </h2>
+        <div className="flex flex-wrap justify-center gap-8 md:gap-24">
+          <Stat description={"Workshops"} value={"17+"} />
+          <Stat description={"Startups"} value={"16"} />
+          <Stat description={"Winners"} value={"3"} />
+        </div>
 
+        <div className="mt-24">
+          <h3 className="mb-16 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-center text-2xl font-medium uppercase tracking-widest text-transparent sm:text-4xl">
+            Top 3 Startups have
+          </h3>
           <div className="flex flex-wrap justify-center gap-8 md:gap-24">
-            <Stat description={"Workshops"} value={"17+"}/>
-            <Stat description={"Startups"} value={"16"}/>
-            <Stat description={"Winners"} value={"3"}/>
+            <Stat description={"B2B customers"} value={"50+"} />
+            <Stat description={"Funding"} value={"1M+"} />
+            <Stat description={"ARR"} value={"300K+"} />
+            <Stat description={"Hired employees"} value={"30+"} />
           </div>
+        </div>
+      </Section>
 
-          <div className="mt-24">
-            <h3 className="mb-16 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-center text-2xl font-medium uppercase tracking-widest text-transparent sm:text-4xl">
-              Top 3 Startups have
-            </h3>
-            <div className="flex flex-wrap justify-center gap-8 md:gap-24">
-              <Stat description={"B2B customers"} value={"50+"}/>
-              <Stat description={"Funding"} value={"1M+"}/>
-              <Stat description={"ARR"} value={"300K+"}/>
-              <Stat description={"Hired employees"} value={"30+"}/>
-            </div>
-          </div>
-        </Section>
-
-        <Section className="bg-purple-950 text-white">
-          <h2 className="mb-12 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-center text-3xl font-semibold uppercase tracking-widest text-transparent sm:text-5xl">
-            Benefits
-          </h2>
+      <Section className="bg-purple-950 text-white">
+        <h2 className="mb-12 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-center text-3xl font-semibold uppercase tracking-widest text-transparent sm:text-5xl">
+          Benefits
+        </h2>
 
-          <p className="mb-8 text-center text-4xl">
-            We <span className="text-yellow-500">support </span>you in achieving
-            your endeavors because your{" "}
-            <span className="text-yellow-500">personal growth</span> is our{" "}
-            <span className="text-yellow-500">goal</span>
+        <p className="mb-8 text-center text-4xl">
+          We <span className="text-yellow-500">support </span>you in achieving
+          your endeavors because your{" "}
+          <span className="text-yellow-500">personal growth</span> is our{" "}
+          <span className="text-yellow-500">goal</span>
+        </p>
+        <div className="my-24 flex flex-col gap-8 lg:px-24 xl:px-44">
+          <p className="px-8 text-center">
+            Are you passionate about AI and ready to make a real-world impact?
+            TUM.ai invites you to join our AI E-Lab, a platform where
+            visionaries, doers, and risk-takers with an interest in founding an
+            AI-based startup come together to shape the future of AI. We value
+            diversity, curiosity, and a commitment to learning and improvement.
           </p>
-          <div className="my-24 flex flex-col gap-8 lg:px-24 xl:px-44">
-            <p className="px-8 text-center">
-              Are you passionate about AI and ready to make a real-world impact?
-              TUM.ai invites you to join our AI E-Lab, a platform where
-              visionaries, doers, and risk-takers with an interest in founding an
-              AI-based startup come together to shape the future of AI. We value
-              diversity, curiosity, and a commitment to learning and improvement.
-            </p>
-            <p className="px-8 text-center">
-              As part of the AI E-Lab, you&apos;ll connect with a vibrant
-              ecosystem of startups, industry partners, and like-minded peers.
-              You&apos;ll have the opportunity to contribute to groundbreaking AI
-              projects and drive positive social impact.
-            </p>
-            <p className="px-8 text-center">
-              This is a part-time program and we expect you to provide us with
-              intermediate deliverables on a weekly basis: pitches, MVPs, learning
-              outcomes, sprint planning, etc. Our events are planned to take place
-              in Munich, so you must be able join in person. The more you commit,
-              the more you get.
-            </p>
-          </div>
-          <Benefits
-              benefits={[
-                {
-                  icon: faCircleNodes,
-                  title: "Access to our network",
-                  text: "In order to shape something meaningful and have impact, knowledge alone does not suffice. You need a network of diverse people you can learn from and share your passion with. We therefore organise several events where you can meet and mingle with TUM.ai members, business and domain experts, startups, founders, investors and many more. Of course, you're also welcome to reach out at any time in between our scheduled events.",
-                },
-                {
-                  icon: faHandshakeSimple,
-                  title: "Count on our support",
-                  text: "We help you develop your final MVP and guide you through the program with individual coaching and tailored mentoring with founders and domain experts. You and your team have the opportunity to experience vivid discussions in our co-working spaces. We also provide you with software and hardware resources, and you can count on tech support.",
-                },
-                {
-                  icon: faBook,
-                  title: "Learn and grow",
-                  text: "Everyone has superpowers and we support you in using them to excel. With hands-on workshops we provide you with the knowledge to found your AI startup and encourage you to test it in a real-world setting. You’ll hear stories of other founders and have the possibility to learn from their experiences. Our program is customer-centric and feedback-oriented, emphasising the importance of listening and interacting with others for personal growth and success.",
-                },
-                {
-                  icon: faHandsHoldingCircle,
-                  title: "We are equity free",
-                  text: "Making AI and the founding process accessible to everyone is one of our missions at TUM.ai. We, therefore, do not charge any costs for the AI E-Lab and do not take any equity stake in your venture. Further, we don’t expect pre-seed readiness or any initial investment. The only investment you have to arrange is your time, eagerness and dedication.",
-                },
-              ]}
-              color="yellow"
-          />
-        </Section>
+          <p className="px-8 text-center">
+            As part of the AI E-Lab, you&apos;ll connect with a vibrant
+            ecosystem of startups, industry partners, and like-minded peers.
+            You&apos;ll have the opportunity to contribute to groundbreaking AI
+            projects and drive positive social impact.
+          </p>
+          <p className="px-8 text-center">
+            This is a part-time program and we expect you to provide us with
+            intermediate deliverables on a weekly basis: pitches, MVPs, learning
+            outcomes, sprint planning, etc. Our events are planned to take place
+            in Munich, so you must be able join in person. The more you commit,
+            the more you get.
+          </p>
+        </div>
+        <Benefits
+          benefits={[
+            {
+              icon: faCircleNodes,
+              title: "Access to our network",
+              text: "In order to shape something meaningful and have impact, knowledge alone does not suffice. You need a network of diverse people you can learn from and share your passion with. We therefore organise several events where you can meet and mingle with TUM.ai members, business and domain experts, startups, founders, investors and many more. Of course, you're also welcome to reach out at any time in between our scheduled events.",
+            },
+            {
+              icon: faHandshakeSimple,
+              title: "Count on our support",
+              text: "We help you develop your final MVP and guide you through the program with individual coaching and tailored mentoring with founders and domain experts. You and your team have the opportunity to experience vivid discussions in our co-working spaces. We also provide you with software and hardware resources, and you can count on tech support.",
+            },
+            {
+              icon: faBook,
+              title: "Learn and grow",
+              text: "Everyone has superpowers and we support you in using them to excel. With hands-on workshops we provide you with the knowledge to found your AI startup and encourage you to test it in a real-world setting. You’ll hear stories of other founders and have the possibility to learn from their experiences. Our program is customer-centric and feedback-oriented, emphasising the importance of listening and interacting with others for personal growth and success.",
+            },
+            {
+              icon: faHandsHoldingCircle,
+              title: "We are equity free",
+              text: "Making AI and the founding process accessible to everyone is one of our missions at TUM.ai. We, therefore, do not charge any costs for the AI E-Lab and do not take any equity stake in your venture. Further, we don’t expect pre-seed readiness or any initial investment. The only investment you have to arrange is your time, eagerness and dedication.",
+            },
+          ]}
+          color="yellow"
+        />
+      </Section>
 
-        <Section className="bg-purple-950 text-white">
-          <h2 className="mb-12 ml-16 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-center text-3xl font-semibold uppercase tracking-widest text-transparent sm:text-5xl md:ml-0">
-            Timeline
-          </h2>
-          <Timeline
-              events={[
-                {
-                  title: "Formation & Ideation",
-                  duration: "4 Weeks",
-                  date: "October 2024",
-                  text: "You will interact with potential co-founders, explore ideas, and form teams through the AI E-Lab onboarding, co-founder matching/team building, and ideation activities. This phase will end with a relaxed informal event where you and your team will share your ideas and concepts.",
-                },
-                {
-                  title: "Idea validation",
-                  duration: "2 Weeks",
-                  date: "November 2024",
-                  text: "You will focus on validating and shaping your startup idea from the previous phase through market research and developing robust business models that will undergo evaluation in the first pitch event, a Litmus Test to a jury.",
-                },
-                {
-                  title: "Build-measure learn",
-                  duration: "4 Weeks",
-                  date: "Nov - Dec 2024",
-                  text: "If your team can make it through the Litmus Test with validated ideas you will start to build prototypes, measure performance, gather valuable feedback from mentors, industry experts, and customers, and continuously iterate towards achieving product-market fit. This phase will end with a Stress test (second pitch event) where a more experienced jury will rigorously test the product market fit and prototypes of your startup and determine who is fit enough to make it to the final pitch to pitch to investors in Phase 4.",
-                },
-                {
-                  title: "Refinement & Final pitch",
-                  duration: "4 Weeks",
-                  date: "Dec - Jan 2025",
-                  text: "Should your team successfully pass the Stress Test, you will continue to refine your prototypes into Minimum Viable Products (MVPs) and further refine your business models, and pitches based on the valuable feedback received from customers, mentors, industry experts, and the jury during the Stress Test. The goal of your startup in this phase will be to prepare to showcase your polished startups to real investors and a public audience in the AI E-Lab final pitch event. ",
-                },
-              ]}
-          />
-        </Section>
+      <Section className="bg-purple-950 text-white">
+        <h2 className="mb-12 ml-16 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-center text-3xl font-semibold uppercase tracking-widest text-transparent sm:text-5xl md:ml-0">
+          Timeline
+        </h2>
+        <Timeline
+          events={[
+            {
+              title: "Formation & Ideation",
+              duration: "4 Weeks",
+              date: "October 2024",
+              text: "You will interact with potential co-founders, explore ideas, and form teams through the AI E-Lab onboarding, co-founder matching/team building, and ideation activities. This phase will end with a relaxed informal event where you and your team will share your ideas and concepts.",
+            },
+            {
+              title: "Idea validation",
+              duration: "2 Weeks",
+              date: "November 2024",
+              text: "You will focus on validating and shaping your startup idea from the previous phase through market research and developing robust business models that will undergo evaluation in the first pitch event, a Litmus Test to a jury.",
+            },
+            {
+              title: "Build-measure learn",
+              duration: "4 Weeks",
+              date: "Nov - Dec 2024",
+              text: "If your team can make it through the Litmus Test with validated ideas you will start to build prototypes, measure performance, gather valuable feedback from mentors, industry experts, and customers, and continuously iterate towards achieving product-market fit. This phase will end with a Stress test (second pitch event) where a more experienced jury will rigorously test the product market fit and prototypes of your startup and determine who is fit enough to make it to the final pitch to pitch to investors in Phase 4.",
+            },
+            {
+              title: "Refinement & Final pitch",
+              duration: "4 Weeks",
+              date: "Dec - Jan 2025",
+              text: "Should your team successfully pass the Stress Test, you will continue to refine your prototypes into Minimum Viable Products (MVPs) and further refine your business models, and pitches based on the valuable feedback received from customers, mentors, industry experts, and the jury during the Stress Test. The goal of your startup in this phase will be to prepare to showcase your polished startups to real investors and a public audience in the AI E-Lab final pitch event. ",
+            },
+          ]}
+        />
+      </Section>
 
-        <Section className="bg-purple-950 text-white">
-          <h2 className="mb-12 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-center text-3xl font-semibold uppercase tracking-widest text-transparent sm:text-5xl">
-            Meet our Partners and Sponsors
-          </h2>
+      <Section className="bg-purple-950 text-white">
+        <h2 className="mb-12 bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-center text-3xl font-semibold uppercase tracking-widest text-transparent sm:text-5xl">
+          Meet our Partners and Sponsors
+        </h2>
 
-          <div className="mb-24">
-            {/*     <h3 className="text-uppercase mb-12 w-full text-center text-2xl font-bold">
+        <div className="mb-24">
+          {/*     <h3 className="text-uppercase mb-12 w-full text-center text-2xl font-bold">
             Partners
           </h3> */}
-            <Logos
-                logos={[
-                  {
-                    src: "/assets/e-lab/partners/ai_munich_w.png",
-                    alt: "AI+Munich",
-                    href: "https://www.must-munich.com/aimunich/",
-                  },
-                  {
-                    src: "/assets/e-lab/partners/ewor_w.png",
-                    alt: "Ewor",
-                    href: "https://ewor.io/",
-                    width: 120,
-                  },
-                  {
-                    src: "/assets/e-lab/partners/campus_founders_w.png",
-                    alt: "Campus Founders",
-                    href: "https://campusfounders.de/",
-                  },
-                  {
-                    src: "/assets/e-lab/partners/merantix.svg",
-                    alt: "Merantix",
-                    href: "https://www.merantix.com/",
-                    width: 200,
-                  },
-                  {
-                    src: "/assets/e-lab/partners/hubert_burda_media.png",
-                    alt: "Burda",
-                    href: "https://www.burda.com/",
-                    width: 300,
-                  },
-                ]}
-            />
-          </div>
           <Logos
-              logos={[
-                {
-                  src: "/assets/e-lab/partners/uvc_w.svg",
-                  alt: "UVC Partners",
-                  href: "https://www.uvcpartners.com/",
-                  width: 140,
-                },
-                {
-                  href: "https://www.cherry.vc/",
-                  src: "/assets/e-lab/partners/cherry_w.png",
-                  alt: "Cherry VC",
-                  width: 140,
-                },
-                {
-                  href: "https://ananda.vc/",
-                  src: "/assets/e-lab/partners/anandavc.png",
-                  alt: "Ananda Impact Ventures",
-                  width: 200,
-                },
-              ]}
+            logos={[
+              {
+                src: "/assets/e-lab/partners/ai_munich_w.png",
+                alt: "AI+Munich",
+                href: "https://www.must-munich.com/aimunich/",
+              },
+              {
+                src: "/assets/e-lab/partners/ewor_w.png",
+                alt: "Ewor",
+                href: "https://ewor.io/",
+                width: 120,
+              },
+              {
+                src: "/assets/e-lab/partners/campus_founders_w.png",
+                alt: "Campus Founders",
+                href: "https://campusfounders.de/",
+              },
+              {
+                src: "/assets/e-lab/partners/merantix.svg",
+                alt: "Merantix",
+                href: "https://www.merantix.com/",
+                width: 200,
+              },
+              {
+                src: "/assets/e-lab/partners/hubert_burda_media.png",
+                alt: "Burda",
+                href: "https://www.burda.com/",
+                width: 300,
+              },
+            ]}
           />
-        </Section>
+        </div>
+        <Logos
+          logos={[
+            {
+              src: "/assets/e-lab/partners/uvc_w.svg",
+              alt: "UVC Partners",
+              href: "https://www.uvcpartners.com/",
+              width: 140,
+            },
+            {
+              href: "https://www.cherry.vc/",
+              src: "/assets/e-lab/partners/cherry_w.png",
+              alt: "Cherry VC",
+              width: 140,
+            },
+            {
+              href: "https://ananda.vc/",
+              src: "/assets/e-lab/partners/anandavc.png",
+              alt: "Ananda Impact Ventures",
+              width: 200,
+            },
+          ]}
+        />
+      </Section>
 
-        <Section className="bg-purple-950 text-center text-white">
-          <Link
-              className="rounded-full border-2 border-yellow-500 p-4 text-center text-center font-bold text-yellow-500"
-              href="mailto:venture@tum-ai.com"
-          >
-            Become a partner
-          </Link>
-        </Section>
+      <Section className="bg-purple-950 text-center text-white">
+        <Link
+          className="rounded-full border-2 border-yellow-500 p-4 text-center text-center font-bold text-yellow-500"
+          href="mailto:venture@tum-ai.com"
+        >
+          Become a partner
+        </Link>
+      </Section>
 
-        <VentureTeam/>
+      <VentureTeam/>
 
-        <Section className="bg-purple-950 text-white">
-          <h3 className="text-primary mb-2 block text-center text-lg font-semibold">
-            FAQ
+
+      <Section className="bg-purple-950 text-white">
+        <h3 className="text-primary mb-2 block text-center text-lg font-semibold">
+          FAQ
+        </h3>
+        <h4 className="text-dark mb-12 text-center text-3xl font-bold sm:text-4xl">
+          Do you have any questions?
+        </h4>
+        <FAQ questions={faq} />
+        <div className="flex flex-col items-center justify-center gap-6 ">
+          <h3 className="mt-20 text-center text-2xl font-semibold">
+            You still have other questions?
           </h3>
-          <h4 className="text-dark mb-12 text-center text-3xl font-bold sm:text-4xl">
-            Do you have any questions?
-          </h4>
-          <FAQ questions={faq}/>
-          <div className="flex flex-col items-center justify-center gap-6 ">
-            <h3 className="mt-20 text-center text-2xl font-semibold">
-              You still have other questions?
-            </h3>
-            <Link
-                className="min-w-[300px] rounded-full border-2 border-yellow-500 p-4 text-center font-semibold transition-colors duration-300 hover:border-red-500 sm:min-w-[400px]"
-                href="mailto:venture@tum-ai.com"
-            >
-              Ask us here
-            </Link>
-          </div>
-        </Section>
-      </>
+          <Link
+            className="min-w-[300px] rounded-full border-2 border-yellow-500 p-4 text-center font-semibold transition-colors duration-300 hover:border-red-500 sm:min-w-[400px]"
+            href="mailto:venture@tum-ai.com"
+          >
+            Ask us here
+          </Link>
+        </div>
+      </Section>
+    </>
   );
 
   interface SnapSliderProps {
diff --git a/app/e-lab/startuplist/page.tsx b/app/e-lab/startuplist/page.tsx
new file mode 100644
index 0000000..06e73c4
--- /dev/null
+++ b/app/e-lab/startuplist/page.tsx
@@ -0,0 +1,63 @@
+import type { Metadata } from "next";
+import Section from "@ui/Section";
+import Link from "next/link";
+import StartupList from "@components/ELabStartupList";
+import { startups } from "data/e-lab-startups";
+
+// Define the metadata for the page
+export const metadata: Metadata = {
+  title: "E-Lab Startup Directory",
+  description: "Registry of all E-Lab based Startups.",
+};
+
+export default function Page() {
+  return (
+    <>
+      {/* Hidden Title for Accessibility */}
+      <h1 className="hidden">E-Lab Startup Directory | List of Startups</h1>
+
+      {/* Header Section */}
+      <Section className="bg-purple-950 text-white">
+        <div className="md:w-3/5 lg:mb-8">
+          <h2 className="bg-gradient-to-r from-yellow-500 to-red-500 bg-clip-text text-5xl font-semibold uppercase text-transparent">
+            E-Lab Startup Directory
+          </h2>
+          <p className="mt-2 text-lg">
+            Registry of all E-Lab based Startups.
+          </p>
+        </div>
+      </Section>
+
+      {/* Main Content Section */}
+      <Section className="bg-purple-950 text-white pt-0">
+        <p className="mb-8 text-center text-4xl">
+          Since <span className="text-yellow-500">2022</span>, we have founded{" "}
+          <span className="text-yellow-500">16 startups</span> within the{" "}
+          <span className="text-yellow-500">E-LAB</span>
+        </p>
+        <div className="flex flex-col gap-8 lg:px-24 xl:px-44">
+          <p className="px-8 text-center">
+            We are proud to present the startups that have emerged from the AI
+            E-Lab program. Each of them has a unique story and a vision to
+            change the world with their AI-based solutions. We invite you to
+            explore the startups and their founders, get inspired by their
+            innovative ideas, and discover exciting job opportunities available
+            with these pioneering companies.
+          </p>
+        </div>
+        <ul style={{ marginTop: '20px' }}></ul>
+        <StartupList startups={startups} />
+      </Section>
+
+      {/* Back Link Section */}
+      <Section className="bg-purple-950 text-center text-white">
+        <Link
+          className="rounded-full border-2 border-yellow-500 p-4 text-center font-bold text-yellow-500"
+          href="/e-lab"
+        >
+          Back to the AI E-LAB
+        </Link>
+      </Section>
+    </>
+  );
+}
diff --git a/app/e-lab/startups/[id]/page.tsx b/app/e-lab/startups/[id]/page.tsx
new file mode 100644
index 0000000..f55f9ab
--- /dev/null
+++ b/app/e-lab/startups/[id]/page.tsx
@@ -0,0 +1,18 @@
+import { startups, Startup} from '@data/e-lab-startups';
+import StartupDetails from '@components/StartupDetails';
+
+export default function StartupPage({ params }: { params: { id: string } }) {
+
+    const startup: Startup | undefined = startups.find((startup: Startup) => {
+        if (startup && startup.id === params.id) {
+            return startup;
+        }
+        return undefined;
+    });
+
+    if (!startup) {
+        return <div>Startup Not Found</div>;
+    }
+
+    return <StartupDetails startup={startup} />;
+}
\ No newline at end of file
diff --git a/app/hero.tsx b/app/hero.tsx
index 2a4a631..3919abd 100644
--- a/app/hero.tsx
+++ b/app/hero.tsx
@@ -27,7 +27,7 @@ export const Hero = () => {
               distort={0.3}
               wireframe={true}
               wireframeLinewidth={5}
-              color={fullConfig.theme.colors.purple["600"]}
+              color={(fullConfig.theme?.colors?.purple?.["600"] as string) ?? "#000000"}
               transparent
               opacity={0.4}
               blending={THREE.AdditiveBlending}
diff --git a/components/ELabStartupList.tsx b/components/ELabStartupList.tsx
new file mode 100644
index 0000000..9e5055e
--- /dev/null
+++ b/components/ELabStartupList.tsx
@@ -0,0 +1,181 @@
+"use client";
+
+import React, { useState, useEffect, useRef } from 'react';
+import { Startup } from '../data/e-lab-startups';
+import Link from "next/link";
+import '../styles/tags.css';
+import Image from "next/image";
+
+interface StartupListProps {
+  startups: Startup[];
+  maxHeight?: string; // Making maxHeight optional
+}
+
+type FilterOptions = Record<string, string[]>;
+
+export default function StartupList({ startups, maxHeight }: StartupListProps) {
+  const [searchQuery, setSearchQuery] = useState('');
+  const [selectedFilters, setSelectedFilters] = useState<FilterOptions>({});
+  const [filteredStartups, setFilteredStartups] = useState<Startup[]>(startups);
+  const [isFilterVisible, setIsFilterVisible] = useState(false);
+
+  const sidebarRef = useRef<HTMLDivElement>(null)
+  const checkboxesRef = useRef<Record<string, HTMLInputElement>>({});
+
+  const filterCategories: (keyof Startup)[] = ['tag', 'batch', 'industry'];
+
+  // Filter startups
+  const filterOptions = startups.reduce((acc, startup) => {
+    filterCategories.forEach((category) => {
+      if (startup[category] && !acc[category]?.includes(startup[category] as string)) {
+        acc[category]?.push(startup[category] as string);
+      }
+    });
+    return acc;
+  }, filterCategories.reduce((acc, category) => ({ ...acc, [category]: [] as string[] }), {} as Record<string, string[]>));
+
+  useEffect(() => {
+    const applyFilters = () => {
+      const filtered = startups.filter((startup) => {
+        const matchesSearchQuery = searchQuery
+            ? startup.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
+            startup.description.toLowerCase().includes(searchQuery.toLowerCase())
+            : true;
+
+        const matchesFilters = Object.entries(selectedFilters).every(([key, values]) => {
+          if (!values.length) return true;
+          return values.includes(startup[key as keyof Startup] as string);
+        });
+
+        return matchesFilters && matchesSearchQuery;
+      });
+      setFilteredStartups(filtered);
+    };
+
+    applyFilters();
+  }, [selectedFilters, searchQuery, startups]);
+
+  const handleFilterChange = (category: string, value: string, isChecked: boolean) => {
+    setSelectedFilters((prevFilters) => {
+      const updatedFilters = { ...prevFilters };
+
+      // Ensure the category array exists
+      if (!updatedFilters[category]) {
+        updatedFilters[category] = [];
+      }
+
+      if (isChecked) {
+        updatedFilters[category]!.push(value); // Use non-null assertion operator (!)
+      } else {
+        updatedFilters[category] = updatedFilters[category]!.filter((v) => v !== value); // Use non-null assertion operator (!)
+      }
+
+      return updatedFilters;
+    });
+  };
+
+  const resetFilters = () => {
+    setSelectedFilters({});
+    setSearchQuery('');
+
+    Object.values(checkboxesRef.current).forEach((checkbox) => {
+      if (checkbox) {
+        checkbox.checked = false;
+      }
+    });
+  };
+
+  // Filter visibility for mobile view
+  const toggleFilterVisibility = () => {
+    setIsFilterVisible(!isFilterVisible);
+  };
+
+  const handleClickOutside = (event: MouseEvent) => {
+    if (sidebarRef.current && !sidebarRef.current.contains(event.target as Node)) {
+      setIsFilterVisible(false);
+    }
+  };
+
+  useEffect(() => {
+    if (isFilterVisible) {
+      document.addEventListener('mousedown', handleClickOutside);
+    } else {
+      document.removeEventListener('mousedown', handleClickOutside);
+    }
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, [isFilterVisible]);
+
+
+  return (
+    <div className="flex flex-col md:flex-row">
+
+      {/* Filter*/}
+      <div className={`fixed inset-0 z-50 flex bg-opacity-75 ${isFilterVisible ? 'block' : 'hidden'} md:static md:block`}>
+        <div ref={sidebarRef} className="max-w-60 flex flex-col p-4 bg-purple-950 rounded shadow-lg md:static md:flex md:flex-col md:p-4 md:border md:border-white md:rounded">
+          <h4 className="text-lg font-semibold mb-4">Filters</h4>
+          {filterCategories.map((category) => (
+            <div key={category} className="mb-4">
+              <h5 className="font-medium mb-2">{category.charAt(0).toUpperCase() + category.slice(1)}</h5>
+              {filterOptions[category]?.map((option) => (
+                <div key={option} className="flex items-center mb-1">
+                  <input
+                    type="checkbox"
+                    id={`${category}-${option}`}
+                    name={`${category}-${option}`}
+                    value={option}
+                    ref={(el) => {
+                      if (el) checkboxesRef.current[`${category}-${option}`] = el;
+                    }}
+                    onChange={(e) => handleFilterChange(category, option, e.target.checked)}
+                    className="mr-2"
+                  />
+                  <label htmlFor={`${category}-${option}`} className="text-sm overflow-hidden text-overflow-ellipsis">{option}</label>
+                </div>
+              ))}
+            </div>
+          ))}
+          <div className="flex justify-center" >
+            <button onClick={resetFilters} className="mt-4 px-4 py-2 bg-purple-500 text-white rounded">Reset Filters</button>
+          </div>
+        </div>
+      </div>
+
+      {/* Main Content */}
+      <main className="flex-1 p-4 pt-0 mx-auto" style={{ maxHeight: maxHeight, width: '100%', maxWidth: '1200' }}>
+        {/* Filter Button for Mobile View */}
+        <div className="block w-full md:hidden mb-4">
+          <button onClick={toggleFilterVisibility} className="w-full p-3 bg-purple-500 rounded">Filter</button>
+        </div>
+        <div className="mb-4">
+          <input
+            type="text"
+            value={searchQuery}
+            onChange={(e) => setSearchQuery(e.target.value)}
+            placeholder="Search startups..."
+            className="w-full px-4 py-2 border rounded text-black"
+          />
+        </div>
+        <div className={`pr-4 ${maxHeight ? "overflow-y-auto scrollbar-hidden scrollbar-purple" : ""}`} style={{ maxHeight: maxHeight ? `calc(${maxHeight} - 90px)` : 'none' }}>
+          {filteredStartups.map((startup) => (
+            <Link key={startup.id} href={`/e-lab/startups/${startup.id}`}>
+              <div className="mb-4 p-4 border rounded-lg shadow flex items-center flex-col md:flex-row">
+                <Image src={startup.logo} alt={`${startup.name} logo`} className="w-16 h-16 object-contain mr-4" width={0} height={0} sizes="100vw" />
+                <div>
+                  <h5 className="text-md font-medium">{startup.name}</h5>
+                  <p className="text-sm text-gray-300">{startup.description}</p>
+                  <div className="flex flex-wrap">
+                    <span className="tag mr-2 mt-2 ">{startup.batch}</span>
+                    <span className="tag mr-2 mt-2 ">{startup.industry}</span>
+                    <span className="tag mr-2 mt-2 ">{startup.tag}</span>
+                  </div>
+                </div>
+              </div>
+            </Link>
+          ))}
+        </div>
+      </main>
+    </div>
+  );
+}
diff --git a/components/Person.tsx b/components/Person.tsx
index fb1435e..5b71fa2 100644
--- a/components/Person.tsx
+++ b/components/Person.tsx
@@ -1,9 +1,7 @@
 import Link from "next/link";
-import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
-import {faInstagram, faLinkedin, faXTwitter, faYoutube} from "@fortawesome/free-brands-svg-icons";
-import {faEnvelope, faLink} from "@fortawesome/free-solid-svg-icons";
-import {Person} from "../data/e-lab";
+import {Person} from "@data/e-lab";
 import Image from "next/image";
+import SocialMediaLinks from "@components/SocialMediaLinks";
 
 interface PersonProps {
     person: Person;
@@ -35,64 +33,7 @@ export default function Person ({person}:PersonProps) {
                       </p>
                   </div>
                   <div className="space-x-4 mt-2 xl:mt-0">
-                      <Link href={person.linkedin} target="_blank">
-                          <FontAwesomeIcon
-                              icon={faLinkedin}
-                              size="lg"
-                              className="text-black duration-500 hover:text-purple-300"
-                              title="LinkedIn Profile"
-                          />
-                      </Link>
-                      {person.x ? (
-                          <Link href={person.x} target="_blank">
-                              <FontAwesomeIcon
-                                  icon={faXTwitter}
-                                  size="lg"
-                                  className="text-black duration-500 hover:text-purple-300"
-                                  title="X (former Twitter) Account"
-                              />
-                          </Link>
-                      ) : null}
-                      {person.instagram ? (
-                          <Link href={person.instagram} target="_blank">
-                              <FontAwesomeIcon
-                                  icon={faInstagram}
-                                  size="lg"
-                                  className="text-black duration-500 hover:text-purple-300"
-                                  title="Instagram Page"
-                              />
-                          </Link>
-                      ) : null}
-                      {person.youtube ? (
-                          <Link href={person.youtube} target="_blank">
-                              <FontAwesomeIcon
-                                  icon={faYoutube}
-                                  size="lg"
-                                  className="text-black duration-500 hover:text-purple-300"
-                                  title="YouTube Channel"
-                              />
-                          </Link>
-                      ) : null}
-                      {person.website ? (
-                          <Link href={person.website} target="_blank">
-                              <FontAwesomeIcon
-                                  icon={faLink}
-                                  size="lg"
-                                  className="text-black duration-500 hover:text-purple-300"
-                                  title="Personal Website"
-                              />
-                          </Link>
-                      ) : null}
-                      {person.email ? (
-                          <Link href={`mailto:${person.email}`}>
-                              <FontAwesomeIcon
-                                  icon={faEnvelope}
-                                  size="lg"
-                                  className="text-black duration-500 hover:text-purple-300"
-                                  title="Send E-Mail"
-                              />
-                          </Link>
-                      ) : null}
+                      <SocialMediaLinks socialMedia={person.socialMedia} iconClassNames={"text-black duration-500 hover:text-purple-300"}/>
                   </div>
               </div>
           </div>
diff --git a/components/SocialMediaLinks.tsx b/components/SocialMediaLinks.tsx
new file mode 100644
index 0000000..f5d39e7
--- /dev/null
+++ b/components/SocialMediaLinks.tsx
@@ -0,0 +1,72 @@
+import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+import {faInstagram, faLinkedin, faXTwitter, faYoutube} from "@fortawesome/free-brands-svg-icons";
+import {faEnvelope, faLink} from "@fortawesome/free-solid-svg-icons";
+import Link from "next/link";
+import {SocialMedia} from "@data/e-lab";
+
+function SocialMediaLinks(props: { socialMedia: SocialMedia, iconClassNames: string}) {
+    return <>
+        {props.socialMedia?.linkedin && (
+            <Link key="linkedin" href={props.socialMedia.linkedin} target="_blank" rel="me">
+                <FontAwesomeIcon
+                    icon={faLinkedin}
+                    size="lg"
+                    className={props.iconClassNames}
+                    title="LinkedIn Profile"
+                />
+            </Link>
+        )}
+        {props.socialMedia?.x && (
+            <Link key="x" href={props.socialMedia.x} target="_blank" rel="me">
+                <FontAwesomeIcon
+                    icon={faXTwitter}
+                    size="lg"
+                    className={props.iconClassNames}
+                    title="X (former Twitter) Account"
+                />
+            </Link>
+        )}
+        {props.socialMedia?.instagram && (
+            <Link key="instagram" href={props.socialMedia.instagram} target="_blank" rel="me">
+                <FontAwesomeIcon
+                    icon={faInstagram}
+                    size="lg"
+                    className={props.iconClassNames}
+                    title="Instagram Page"
+                />
+            </Link>
+        )}
+        {props.socialMedia?.youtube && (
+            <Link key="youtube" href={props.socialMedia.youtube} target="_blank" rel="me">
+                <FontAwesomeIcon
+                    icon={faYoutube}
+                    size="lg"
+                    className={props.iconClassNames}
+                    title="YouTube Channel"
+                />
+            </Link>
+        )}
+        {props.socialMedia?.website && (
+            <Link key="website" href={props.socialMedia.website} target="_blank" rel="me">
+                <FontAwesomeIcon
+                    icon={faLink}
+                    size="lg"
+                    className={props.iconClassNames}
+                    title="Website"
+                />
+            </Link>
+        )}
+        {props.socialMedia?.email && (
+            <Link key="email" href={`mailto:${props.socialMedia.email}`} rel="me">
+                <FontAwesomeIcon
+                    icon={faEnvelope}
+                    size="lg"
+                    className={props.iconClassNames}
+                    title="Send E-Mail"
+                />
+            </Link>
+        )}
+    </>;
+}
+
+export default SocialMediaLinks;
\ No newline at end of file
diff --git a/components/StartupDetails.tsx b/components/StartupDetails.tsx
new file mode 100644
index 0000000..e730d77
--- /dev/null
+++ b/components/StartupDetails.tsx
@@ -0,0 +1,81 @@
+"use client";
+
+import Image from 'next/image';
+import Link from 'next/link';
+import { useState } from 'react';
+import Person from "@components/Person";
+import {Startup} from "@data/e-lab-startups";
+import SocialMediaLinks from "@components/SocialMediaLinks";
+
+const StartupDetails = ({ startup }: { startup: Startup }) => {
+  const [imageError, setImageError] = useState(false);
+
+  return (
+      <div className="bg-purple-950 text-white min-h-screen pt-16 p-8">
+
+        <div className="max-w-4xl mx-auto">
+
+          <div className="flex sm:items-center mb-8 flex-col sm:flex-row">
+            <div className="flex items-center">
+                <h1 className="text-4xl font-bold mr-4">{startup.name}</h1>
+                {!imageError && (
+                    <Image
+                        src={startup.logo}
+                        alt={`${startup.name} logo`}
+                        width={100}
+                        height={100}
+                        onError={() => setImageError(true)}
+                    />
+                )}
+            </div>
+
+            <div className="sm:ml-4 sm:pl-4 sm:border-l sm:border-gray-300 mt-4 sm:mt-0 flex flex-row">
+              <h2 className="sr-only">Social Media Links</h2>
+            {startup.socialMedia && (
+                  <div className="flex space-x-4">
+                    <SocialMediaLinks socialMedia={startup.socialMedia}
+                    iconClassNames={"duration-500 hover:text-yellow-500"}/>
+                  </div>
+            )}
+            </div>
+
+        </div>
+
+        <p className="text-xl mb-8">{startup.description}</p>
+
+        <h2 className="text-2xl font-semibold mb-4">Metrics</h2>
+          <ul className="mb-8">
+            {Object.entries(startup.metrics).map(([key, value]) => (
+                <li key={key} className="mb-2">
+                  <span className="font-bold">{key}:</span> {String(value)}
+                </li>
+            ))}
+          </ul>
+
+          <h2 className="text-2xl font-semibold mb-4">About {startup.name}</h2>
+          <p className="mb-8">{startup.about}</p>
+
+          <h2 className="text-2xl font-semibold mb-4">Founders</h2>
+          <div
+              className="mb-8 grid grid-cols-1 gap-y-4 sm:grid-cols-2 sm:gap-x-6 sm:gap-y-10 lg:gap-x-8">
+            {startup.founders?.map((person) => (
+                <Person person={person} key={person.id}/>
+            ))}
+          </div>
+
+          <Link
+              href={startup.website}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="bg-yellow-500 text-black px-4 py-2 rounded-full font-semibold hover:bg-yellow-600 transition-colors"
+          >
+            Visit Website
+          </Link>
+
+
+        </div>
+      </div>
+  );
+};
+
+export default StartupDetails;
\ No newline at end of file
diff --git a/data/e-lab-startups.tsx b/data/e-lab-startups.tsx
index dc88c4c..922ac4e 100644
--- a/data/e-lab-startups.tsx
+++ b/data/e-lab-startups.tsx
@@ -1,10 +1,15 @@
+
+import {Person, SocialMedia} from "@data/e-lab";
+
+
 export interface Startup {
     id: string;
     name: string;
     description: string;
-    founders: Founder[];
+    founders: Person[];
     metrics: Metrics;
     website: string;
+    socialMedia?: SocialMedia;
     logo: string;
     about?: string;
 
@@ -42,17 +47,17 @@ export const startups: Startup[] = [
         description: "Airbnb is an online marketplace for short-term homestays and experiences.",
         founders: [
             {
-            name: "Brian Chesky",
-            role: "CEO, Co-founder"
-            },
-            {
-            name: "Joe Gebbia",
-            role: "Co-founder"
-            },
-            {
-            name: "Nathan Blecharczyk",
-            role: "Chief Strategy Officer, Co-founder"
+            id: "brian-chesky",
+            firstName: "Brian",
+            lastName: "Chesky",
+            role: "CEO, Co-founder",
+            imgSrc: "",
+            imgAlt: "Brian Chesky",
+            socialMedia: {
+                x: "https://twitter.com/bchesky",
+                linkedin: "https://www.linkedin.com/in/brian-chesky-5b695b",
             }
+            },
         ],
         metrics: {
             "Year Founded": "2008",
@@ -88,10 +93,6 @@ export const startups: Startup[] = [
         name: "Tesla",
         description: "Tesla, Inc. is accelerating the world's transition to sustainable energy with electric cars, solar and integrated renewable energy solutions for homes and businesses. Founded in 2003 by a group of engineers who wanted to prove that people didn’t need to compromise to drive electric – that electric vehicles can be better, quicker and more fun to drive than gasoline cars.",
         founders: [
-            {
-                name: "Elon Musk",
-                role: "CEO"
-            },
         ],
         metrics: {
             "Year Founded": "2008",
@@ -126,10 +127,6 @@ export const startups: Startup[] = [
         name: "Tesla1",
         description: "Tesla, Inc. is accelerating the world's transition to sustainable energy with electric cars, solar and integrated renewable energy solutions for homes and businesses. Founded in 2003 by a group of engineers who wanted to prove that people didn’t need to compromise to drive electric – that electric vehicles can be better, quicker and more fun to drive than gasoline cars.",
         founders: [
-            {
-                name: "Elon Musk",
-                role: "CEO"
-            },
         ],
         metrics: {
             "Year Founded": "2008",
@@ -158,42 +155,4 @@ export const startups: Startup[] = [
             date: "May 20, 2023",
         }],
     },
-
-    {
-        id: "tesla2",
-        name: "Tesla2",
-        description: "Tesla, Inc. is accelerating the world's transition to sustainable energy with electric cars, solar and integrated renewable energy solutions for homes and businesses. Founded in 2003 by a group of engineers who wanted to prove that people didn’t need to compromise to drive electric – that electric vehicles can be better, quicker and more fun to drive than gasoline cars.",
-        founders: [
-            {
-                name: "Elon Musk",
-                role: "CEO"
-            },
-        ],
-        metrics: {
-            "Year Founded": "2008",
-            "Valuation": "$113 billion",
-            "Funding Raised": "$6.4 billion",
-            "Employees": "6,132"
-        },
-        website: "http://tesla2.com",
-        logo: "/assets/e-lab/startups/Tesla_Motors.svg.png",
-        industry: "Automotive",
-        batch: "S10",
-        tag: "Is Hiring",
-        jobs: [{
-            name: "Senior Autopilot Software Engineer",
-            location: "Palo Alto, CA",
-            salary: "$180,000 - $230,000 a year",
-            experience: "4+ years",
-        }],
-        latest_news: [{
-            message: "Tesla is looking for a Senior Autopilot Software Engineer in Palo Alto, CA. The salary range is $180,000 - $230,000 a year with a requirement of 4+ years of experience.",
-            link: "https://www.tesla.com/blog/autopilot-future-of-driving",
-            date: "April 15, 2023",
-        }, {
-            message: "Tesla announces a new project to expand its energy storage solutions, aiming to revolutionize the electric grid.",
-            link: "https://www.tesla.com/blog/energy-storage-solutions",
-            date: "May 20, 2023",
-        }],
-    },
 ];
\ No newline at end of file
diff --git a/data/e-lab.tsx b/data/e-lab.tsx
index 27648cd..9c260d8 100644
--- a/data/e-lab.tsx
+++ b/data/e-lab.tsx
@@ -111,12 +111,17 @@ export interface Person {
     description?: string;
     imgSrc: string;
     imgAlt: string;
+    socialMedia: SocialMedia;
+}
+
+export interface SocialMedia {
     linkedin: string;
     x?: string;
     instagram?: string;
     youtube?: string;
     website?: string;
     email?: string;
+
 }
 
 export const team: Person[] = [
@@ -135,12 +140,14 @@ export const team: Person[] = [
         "Driven by a desire to make the world a better place, I am committed to solving the most challenging problems with technology. Feel free to reach out — I am always up for a coffee and a good conversation! ☕",
     imgSrc: "/assets/e-lab/team/laurenz_sommerlad.jpg",
     imgAlt: "Laurenz Sommerlad",
-    linkedin: "https://www.linkedin.com/in/laurenzsommerlad/",
-    x: "https://x.com/Lauros_World",
-    instagram: "https://www.instagram.com/laurenzsommerlad/",
-    youtube: "https://www.youtube.com/@LaurenzSommerlad",
-    website: "https://laurenzsommerlad.com",
-    email: "laurenz.sommerlad@tum-ai.com"
+    socialMedia: {
+      linkedin: "https://www.linkedin.com/in/laurenzsommerlad/",
+      x: "https://x.com/Lauros_World",
+      instagram: "https://www.instagram.com/laurenzsommerlad/",
+      youtube: "https://www.youtube.com/@LaurenzSommerlad",
+      website: "https://laurenzsommerlad.com",
+      email: "laurenz.sommerlad@tum-ai.com"
+    }
   },
   {
     id: "jan-christopher-michalczik",
@@ -153,12 +160,14 @@ export const team: Person[] = [
     "If you need more info than is presented on our website, sign up for our newsletter, go to one of our info events, or just reach out directly.",
     imgSrc: "/assets/e-lab/team/jan_michalczik.png",
     imgAlt: "Jan-Christopher Michalczik",
-    linkedin: "https://www.linkedin.com/in/jan-michalczik/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "jan-christopher.michalczik@tum-ai.com"
+    socialMedia: {
+      linkedin: "https://www.linkedin.com/in/jan-michalczik/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "jan-christopher.michalczik@tum-ai.com"
+    }
   },
   {
     id: "benedikt-wieser",
@@ -168,12 +177,14 @@ export const team: Person[] = [
     description: "Having a background in Business Administration from the University of St. Gallen and studies at Berkeley, I’ve worked on multiple startup projects, in venture capital, at a scale-up, and participated in the AI E-Lab 2.0 startup incubator.\n\nAdditional to my professional experience, I learnt to lead teams in high-stress situations as an officer cadet in the Austrian Armed Forces, instilling in me strong personal drive and get-things-done thinking.\n\nBesides being passionate about entrepreneurship I love outdoor adventures like whitewater rafting and hiking, and always strive to explore and feel the intensity of life. I am absolutely looking forward to accompanying you on your individual, entrepreneurial journey. Let’s build something amazing together!",
     imgSrc: "/assets/e-lab/team/benedikt_wieser.jpg",
     imgAlt: "Benedikt Wieser",
-    linkedin: "https://www.linkedin.com/in/benedikt-wieser-6430a3139/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: ""
+    socialMedia: {
+      linkedin: "https://www.linkedin.com/in/benedikt-wieser-6430a3139/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: ""
+    }
   },
   {
     id: "emine-hakani",
@@ -183,12 +194,14 @@ export const team: Person[] = [
     description: "",
     imgSrc: "/assets/e-lab/team/emine_hakani.png",
     imgAlt: "Emine Hakani",
-    linkedin: "https://www.linkedin.com/in/emine-hakani-muc/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "venture@tum-ai.com"
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/emine-hakani-muc/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "venture@tum-ai.com"
+    }
   },
   {
     id: "philip-juenemann",
@@ -198,12 +211,14 @@ export const team: Person[] = [
     description: "Passionate about Entrepreneurship, Tech and AI!",
     imgSrc: "/assets/e-lab/team/philip_juenemann.jpg",
     imgAlt: "Philip Jünemann",
-    linkedin: "https://www.linkedin.com/in/philip-louis-j%C3%BCnemann/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "philip.juenemann@tum-ai.com"
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/philip-louis-j%C3%BCnemann/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "philip.juenemann@tum-ai.com"
+    }
 },
   {
     id: "david-reyes",
@@ -214,12 +229,14 @@ export const team: Person[] = [
     "Innovation drives me, and I have found a fitting place within the Munich entrepreneurial ecosystem. I am dedicated to ensuring you become part of an amazing batch of smart, diverse, and driven individuals who are passionate about developing solutions and maintaining a thriving sense of community. I look forward to working together to take your startup idea to the moon.",
     imgSrc: "/assets/e-lab/team/david_reyes.png",
     imgAlt: "David Reyes",
-    linkedin: "https://www.linkedin.com/in/davidreyesj/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "david.reyes@tum-ai.com"
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/davidreyesj/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "david.reyes@tum-ai.com"
+    }
 },
   {
     id: "zaid-efraij",
@@ -229,12 +246,14 @@ export const team: Person[] = [
     description: "",
     imgSrc: "/assets/e-lab/team/zaid_efraij.jpg",
     imgAlt: "Zaid Efraij",
-    linkedin: "https://www.linkedin.com/in/zaid-efraij-b6630722a/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "zaid.efraij@tum-ai.com"
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/zaid-efraij-b6630722a/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "zaid.efraij@tum-ai.com"
+    }
   },
   {
     id: "nagaharshith-makam-sreenivasulu",
@@ -244,12 +263,14 @@ export const team: Person[] = [
     description: "Hey, I am Nagah. In addition to pursuing a bachelor's degree in Management and Technology at TUM, I also assist with marketing at TUM.ai and TEG e.V. (The Entrepreneurial Group, student startup club in Munich). With a background in business, I am interested in using AI agents to improve traditional business settings. Professionally, I work as a Business Development working student at roadsurfer GmbH.\n\nI am excited to meet you and help you with your AI startup journey!",
     imgSrc: "/assets/e-lab/team/nagah_sreenivasulu.jpg",
     imgAlt: "Nagah Sreenivasulu",
-    linkedin: "https://www.linkedin.com/in/nagaharshith",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "nagaharshith-makam.sreenivasulu@tum-ai.com"
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/nagaharshith",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "nagaharshith-makam.sreenivasulu@tum-ai.com"
+    }
   },
 ];
 
@@ -262,12 +283,14 @@ export const alumni: Person[] = [
     description: "Abdul serves as an Advisor at TUM.ai, where he brings his experience and expertise in leadership, entrepreneurship, and venture development. He previously led the AI E-Lab as the Head of Venture alongside Daniil Morozov, where they envisioned and re-established the AI E-Lab as a straight-shooting startup sandbox and a genuine community designed to engineer serendipity among founders. Throughout the program, Abdul has been and will continue to be a humble sparring partner for our founders.",
     imgSrc: "/assets/e-lab/team/abdul_faruk.jpg",
     imgAlt: "Abdulqadir Faruk",
-    linkedin: "https://www.linkedin.com/in/abdulqadirfaruk/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "abdul.faruk@tum-ai.com",
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/abdulqadirfaruk/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "abdul.faruk@tum-ai.com",
+    }
   },
   {
     id: "daniil-morozov",
@@ -277,12 +300,14 @@ export const alumni: Person[] = [
     description: "",
     imgSrc: "/assets/e-lab/team/daniil_morozov.png",
     imgAlt: "Daniil Morozov",
-    linkedin: "https://www.linkedin.com/in/daniil-morozov-912490252/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "",
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/daniil-morozov-912490252/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "",
+    }
   },
   {
     id: "nektarios-totikos",
@@ -292,12 +317,14 @@ export const alumni: Person[] = [
     description: "",
     imgSrc: "/assets/e-lab/team/nektarios_totikos.jpeg",
     imgAlt: "Nektarios Totikos",
-    linkedin: "https://www.linkedin.com/in/nektarios-totikos/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "",
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/nektarios-totikos/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "",
+    }
   },
   {
     id: "ian-tolan",
@@ -307,12 +334,14 @@ export const alumni: Person[] = [
     description: "",
     imgSrc: "/assets/e-lab/team/ian_tolan.png",
     imgAlt: "Ian Tolan",
-    linkedin: "https://www.linkedin.com/in/ian-tolan-a85b0a107/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "",
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/ian-tolan-a85b0a107/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "",
+    }
   },
   {
     id: "david-podolskyi",
@@ -322,12 +351,14 @@ export const alumni: Person[] = [
     description: "",
     imgSrc: "/assets/e-lab/team/david_podolskyi.png",
     imgAlt: "David Podolskyi",
-    linkedin: "https://www.linkedin.com/in/davidpodolsky/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "",
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/davidpodolsky/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "",
+    }
   },
   {
     id: "luca-dombetzki",
@@ -337,12 +368,14 @@ export const alumni: Person[] = [
     description: "",
     imgSrc: "/assets/e-lab/team/luca_dombetzki.png",
     imgAlt: "Luca Dombetzki",
-    linkedin: "https://www.linkedin.com/in/luca-dombetzki/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "",
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/luca-dombetzki/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "",
+    }
   },
   {
     id: "yarhy-flores",
@@ -352,12 +385,14 @@ export const alumni: Person[] = [
     description: "",
     imgSrc: "/assets/e-lab/team/yarhy_flores.png",
     imgAlt: "Yarhy Flores",
-    linkedin: "https://www.linkedin.com/in/yarhy-flores/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "",
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/yarhy-flores/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "",
+    }
   },
   {
     id: "sebastian-wilhelm",
@@ -367,12 +402,14 @@ export const alumni: Person[] = [
     description: "",
     imgSrc: "/assets/e-lab/team/sebastian_wilhelm.png",
     imgAlt: "Sebastian Wilhelm",
-    linkedin: "https://www.linkedin.com/in/sebastian-wilhelm/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "",
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/sebastian-wilhelm/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "",
+    }
   },
   {
     id: "can-kayalan",
@@ -382,12 +419,14 @@ export const alumni: Person[] = [
     description: "",
     imgSrc: "/assets/e-lab/team/can_kayalan.png",
     imgAlt: "Can Kayalan",
-    linkedin: "https://www.linkedin.com/in/can-kayalan/",
-    x: "",
-    instagram: "",
-    youtube: "",
-    website: "",
-    email: "",
+    socialMedia: {
+     linkedin: "https://www.linkedin.com/in/can-kayalan/",
+      x: "",
+      instagram: "",
+      youtube: "",
+      website: "",
+      email: "",
+    }
   },
 ];
 
diff --git "a/public/assets/e-lab/startups/Airbnb_Logo_B\303\251lo.svg.png" "b/public/assets/e-lab/startups/Airbnb_Logo_B\303\251lo.svg.png"
new file mode 100644
index 0000000..faf3dac
Binary files /dev/null and "b/public/assets/e-lab/startups/Airbnb_Logo_B\303\251lo.svg.png" differ
diff --git a/public/assets/e-lab/startups/Tesla_Motors.svg.png b/public/assets/e-lab/startups/Tesla_Motors.svg.png
new file mode 100644
index 0000000..e17d5f9
Binary files /dev/null and b/public/assets/e-lab/startups/Tesla_Motors.svg.png differ
diff --git a/styles/tags.css b/styles/tags.css
new file mode 100644
index 0000000..1d00dc3
--- /dev/null
+++ b/styles/tags.css
@@ -0,0 +1,9 @@
+.tag {
+    display: inline-block;
+    background-color: #6a0dad; /* Purple background */
+    color: white;
+    padding: 5px 10px;
+    border-radius: 15px; /* Rounded corners */
+    margin-right: 5px; /* Space between tags */
+    font-size: 0.875rem; /* Tailwind's text-sm size */
+  }
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 86430dd..3f72709 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,6 +28,9 @@
       "@components/*": [
         "./components/*"
       ],
+      "@data/*": [
+        "./data/*"
+      ],
       "@ui/*": [
         "./components/ui/*"
       ],