diff --git a/docs/src/components/Footer/index.js b/docs/src/components/Footer/index.js
index e5c09fe8e..d878b27ae 100644
--- a/docs/src/components/Footer/index.js
+++ b/docs/src/components/Footer/index.js
@@ -5,15 +5,15 @@ const menus = [
     name: "For Developers",
     child: [
       {
-        menu: "Documentation (WIP)",
+        menu: "Documentation",
         path: "/intro",
       },
       {
-        menu: "Hardware (WIP)",
+        menu: "Hardware",
         path: "/hardware",
       },
       {
-        menu: "API Reference (WIP)",
+        menu: "API Reference",
         path: "/api-reference",
       },
       {
@@ -67,7 +67,7 @@ const getCurrentYear = new Date().getFullYear();
 
 export default function Footer() {
   return (
-    <footer className="flex-shrink-0 border-t dark:border-gray-800 border-gray-200 py-10">
+    <footer className="flex-shrink-0 dark:bg-[#09090B]/10 bg-[#D4D4D8]/10 relative overflow-hidden py-10">
       <div className="container">
         <div className="grid grid-cols-2 gap-8 md:grid-cols-2 lg:grid-cols-6">
           <div className="lg:col-span-3 col-span-2">
diff --git a/docs/src/components/Announcement/index.js b/docs/src/containers/Banner/index.js
similarity index 100%
rename from docs/src/components/Announcement/index.js
rename to docs/src/containers/Banner/index.js
diff --git a/docs/src/containers/DownloadApp/index.js b/docs/src/containers/DownloadApp/index.js
new file mode 100644
index 000000000..54c9412e1
--- /dev/null
+++ b/docs/src/containers/DownloadApp/index.js
@@ -0,0 +1,155 @@
+import React, { useState, useEffect } from "react";
+import axios from "axios";
+import { FaWindows, FaApple, FaLinux } from "react-icons/fa";
+
+const systemsTemplate = [
+  {
+    name: "Download for Mac (M1/M2)",
+    logo: FaApple,
+    fileFormat: "{appname}-mac-arm64-{tag}.dmg",
+  },
+  {
+    name: "Download for Mac (Intel)",
+    logo: FaApple,
+    fileFormat: "{appname}-mac-x64-{tag}.dmg",
+  },
+  {
+    name: "Download for Windows",
+    logo: FaWindows,
+    fileFormat: "{appname}-win-x64-{tag}.exe",
+  },
+  {
+    name: "Download for Linux",
+    logo: FaLinux,
+    fileFormat: "{appname}-linux-amd64-{tag}.deb",
+  },
+];
+
+export default function DownloadApp() {
+  const [systems, setSystems] = useState(systemsTemplate);
+
+  const getLatestReleaseInfo = async (repoOwner, repoName) => {
+    const url = `https://api.github.com/repos/${repoOwner}/${repoName}/releases/latest`;
+    try {
+      const response = await axios.get(url);
+      return response.data;
+    } catch (error) {
+      console.error(error);
+      return null;
+    }
+  };
+
+  const extractAppName = (fileName) => {
+    // Extract appname using a regex that matches the provided file formats
+    const regex = /^(.*?)-(?:mac|win|linux)-(?:arm64|x64|amd64)-.*$/;
+    const match = fileName.match(regex);
+    return match ? match[1] : null;
+  };
+
+  useEffect(() => {
+    const updateDownloadLinks = async () => {
+      try {
+        const releaseInfo = await getLatestReleaseInfo("janhq", "jan");
+
+        // Extract appname from the first asset name
+        const firstAssetName = releaseInfo.assets[0].name;
+        const appname = extractAppName(firstAssetName);
+
+        if (!appname) {
+          console.error(
+            "Failed to extract appname from file name:",
+            firstAssetName
+          );
+
+          return;
+        }
+
+        // Remove 'v' at the start of the tag_name
+        const tag = releaseInfo.tag_name.startsWith("v")
+          ? releaseInfo.tag_name.substring(1)
+          : releaseInfo.tag_name;
+
+        const updatedSystems = systems.map((system) => {
+          const downloadUrl = system.fileFormat
+            .replace("{appname}", appname)
+            .replace("{tag}", tag);
+          return {
+            ...system,
+            href: `https://github.com/janhq/jan/releases/download/${releaseInfo.tag_name}/${downloadUrl}`,
+          };
+        });
+
+        setSystems(updatedSystems);
+      } catch (error) {
+        console.error("Failed to update download links:", error);
+      }
+    };
+
+    updateDownloadLinks();
+  }, []);
+
+  return (
+    <div>
+      <div className="flex flex-col gap-y-4">
+        <div className="flex items-center space-x-4">
+          <h6 className="w-[100px]">Windows</h6>
+          {systems
+            .filter((x) => x.name.includes("Windows"))
+            .map((system) => (
+              <a
+                href={system.href}
+                className="inline-flex px-4 py-3 rounded-lg text-lg font-semibold cursor-pointer justify-center items-center space-x-2 border border-gray-400 dark:border-gray-700 text-gray-600 dark:text-white"
+              >
+                <system.logo />
+                <span>{system.name}</span>
+              </a>
+            ))}
+        </div>
+        <div className="flex items-start lg:items-center space-x-4">
+          <h6 className="w-[100px]">Mac</h6>
+          <div className="flex flex-col lg:flex-row gap-4">
+            {systems
+              .filter((x) => x.name.includes("Mac"))
+              .map((system) => (
+                <a
+                  href={system.href}
+                  className="inline-flex px-4 py-3 rounded-lg text-lg font-semibold cursor-pointer justify-center items-center space-x-2 border border-gray-400 dark:border-gray-700 text-gray-600 dark:text-white"
+                >
+                  <system.logo />
+                  <span>{system.name}</span>
+                </a>
+              ))}
+          </div>
+        </div>
+        <div className="flex items-center space-x-4">
+          <h6 className="w-[100px]">Linux</h6>
+          {systems
+            .filter((x) => x.name.includes("Linux"))
+            .map((system) => (
+              <a
+                href={system.href}
+                className="inline-flex px-4 py-3 rounded-lg text-lg font-semibold cursor-pointer justify-center items-center space-x-2 border border-gray-400 dark:border-gray-700 text-gray-600 dark:text-white"
+              >
+                <system.logo />
+                <span>{system.name}</span>
+              </a>
+            ))}
+        </div>
+      </div>
+
+      {/* {systems.map((system) => (
+        <a
+          href={system.href}
+          className="inline-flex px-4 py-3 rounded-lg text-lg font-semibold cursor-pointer justify-center items-center space-x-2 border border-gray-400 dark:border-gray-700 text-gray-600 dark:text-white"
+        >
+          <img
+            src={system.logo}
+            alt="Logo"
+            className="w-3 mr-3 -mt-1 flex-shrink-0"
+          />
+          <span>{system.name}</span>
+        </a>
+      ))} */}
+    </div>
+  );
+}
diff --git a/docs/src/containers/SocialButton/index.js b/docs/src/containers/SocialButton/index.js
new file mode 100644
index 000000000..3fca77c95
--- /dev/null
+++ b/docs/src/containers/SocialButton/index.js
@@ -0,0 +1,27 @@
+import React from "react";
+import { FaGithub, FaDiscord } from "react-icons/fa";
+
+export default function SocialButton() {
+  return (
+    <div className="flex items-center space-x-2 justify-center lg:justify-start">
+      <a
+        href="https://github.com/janhq/nitro/releases"
+        className="inline-flex px-4 py-3 rounded-lg text-lg font-semibold cursor-pointer justify-center items-center space-x-2 border border-gray-400 dark:border-gray-700 text-gray-600 dark:text-white"
+      >
+        <span>
+          <FaDiscord className="text-xl" />
+        </span>
+        <span>Join our Discord</span>
+      </a>
+      <a
+        href="https://github.com/janhq/jan"
+        className="text-white bg-blue-600 hover:bg-blue-700 hover:text-white inline-flex px-4 py-3 rounded-lg text-lg font-semibold cursor-pointer justify-center items-center space-x-2"
+      >
+        <span>
+          <FaGithub className="text-lg" />
+        </span>
+        <span>View on Github</span>
+      </a>
+    </div>
+  );
+}
diff --git a/docs/src/pages/index.js b/docs/src/pages/index.js
index f0f025e67..d86865772 100644
--- a/docs/src/pages/index.js
+++ b/docs/src/pages/index.js
@@ -1,48 +1,98 @@
 import React from "react";
-import Dropdown from "@site/src/components/Elements/dropdown";
+import DownloadApp from "@site/src/containers/DownloadApp";
 import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
 
 import useBaseUrl from "@docusaurus/useBaseUrl";
 import Layout from "@theme/Layout";
-import AnnoncementBanner from "@site/src/components/Announcement";
-
-import { AiOutlineGithub } from "react-icons/ai";
+import Banner from "@site/src/containers/Banner";
 
 import ThemedImage from "@theme/ThemedImage";
 
-import DownloadLink from "@site/src/components/Elements/downloadLink";
+import SocialButton from "@site/src/containers/SocialButton";
 
 export default function Home() {
   const { siteConfig } = useDocusaurusContext();
   return (
     <>
-      {/* <AnnoncementBanner /> */}
+      <Banner />
       <Layout
         title={`${siteConfig.tagline}`}
         description="Jan is a ChatGPT-alternative that runs on your own computer, with a local API server."
       >
         <main>
           <div className="container">
-            <div className="grid grid-cols-1 lg:grid-cols-12 mt-10 gap-8 items-center">
-              <div className="col-span-7">
-                <h1 className="bg-gradient-to-b dark:from-white from-black to-gray-700 dark:to-gray-400 bg-clip-text text-7xl font-semibold leading-tight text-transparent dark:text-transparent lg:leading-tight">
+            <div className="grid grid-cols-1 lg:grid-cols-12 mt-8 gap-8 items-center relative">
+              <div className="col-span-full lg:col-span-5 lg:text-left text-center relative z-10">
+                <h1 className="bg-gradient-to-b dark:from-white from-black to-gray-700 dark:to-gray-400 bg-clip-text text-6xl font-black leading-tight text-transparent dark:text-transparent lg:leading-tight">
                   Own your AI
                 </h1>
                 <p className="text-2xl mt-1">
                   Jan is an open-source alternative to ChatGPT that runs on your
-                  own computer
+                  own computer.
                 </p>
+                <div className="mt-8">
+                  <SocialButton />
+                </div>
               </div>
-              <div className="col-span-5">
-                <p>
-                  Lorem ipsum, dolor sit amet consectetur adipisicing elit.
-                  Error explicabo aperiam molestias neque quod ad id dolorum
-                  adipisci dicta magni possimus, tempore temporibus magnam nisi
-                  harum veritatis eaque molestiae suscipit.
-                </p>
+              <div className="col-span-full lg:col-span-7">
+                <div className="relative text-center">
+                  <ThemedImage
+                    className="rounded-md shadow-2xl dark:shadow-none w-full lg:w-4/5"
+                    alt="App screenshots"
+                    sources={{
+                      light: useBaseUrl(
+                        "/img/homepage/app-base-screen-light.png"
+                      ),
+                      dark: useBaseUrl(
+                        "/img/homepage/app-base-screen-dark.png"
+                      ),
+                    }}
+                  />
+                </div>
               </div>
             </div>
           </div>
+
+          <div className="bg-gray-100 dark:bg-[#09090B]/20 border-y border-gray-300 dark:border-gray-800 mt-10 py-10">
+            <div className="container">
+              <div className="w-full lg:w-3/4 mx-auto">
+                <DownloadApp />
+              </div>
+            </div>
+          </div>
+
+          <div className="container text-center mt-20">
+            <h5>Take Control</h5>
+            <p>
+              Jan runs 100% on your own machine, privately, predictably and even
+              in offline, with no surprise bills
+            </p>
+          </div>
+
+          <div className="container text-center mt-20">
+            <h5>100% Open Source</h5>
+            <p>
+              Say goodbye to black boxes. Jan has well-documented code and
+              stores data in open-format files that you can inspect, verify and
+              tinker with.
+            </p>
+          </div>
+
+          <div className="container text-center mt-20">
+            <h5>Extensions</h5>
+            <p>
+              Jan has a powerful Extensions API inspired by VSCode. In fact,
+              most of Jan's core services are built as extensions.
+            </p>
+          </div>
+
+          <div className="container text-center my-20">
+            <h5>No-fuss Compatibility</h5>
+            <p>
+              Jan's API aims to be a drop-in replacement for OpenAI's REST API,
+              with a local server that runs at port 1337
+            </p>
+          </div>
         </main>
       </Layout>
     </>
diff --git a/docs/src/styles/components/base.scss b/docs/src/styles/components/base.scss
index 31a09e914..a9f3b800a 100644
--- a/docs/src/styles/components/base.scss
+++ b/docs/src/styles/components/base.scss
@@ -2,7 +2,7 @@
   
   html[data-theme="light"] {
     --custom-radial-blur: #e1e7fd;
-    --ifm-background-color: #fafafa;
+    --ifm-background-color: #fff;
     --ifm-color-primary: #2563eb; /* New Primary Blue */
     --ifm-color-primary-dark: #204fcf; /* Darker Blue */
     --ifm-color-primary-darker: #1b45b7; /* Even Darker Blue */
@@ -36,7 +36,7 @@
   body {
     @apply text-base;
     @apply antialiased;
-    @apply bg-[#FAFAFA] dark:bg-[#18181B];
+    @apply bg-white dark:bg-[#18181B];
   }
 
   img {
diff --git a/docs/src/styles/tweaks/navbar.scss b/docs/src/styles/tweaks/navbar.scss
index 96c074455..3e2198114 100644
--- a/docs/src/styles/tweaks/navbar.scss
+++ b/docs/src/styles/tweaks/navbar.scss
@@ -11,7 +11,7 @@
   }
 
   &__inner {
-    @apply border border-gray-300 dark:border-gray-800 rounded-lg bg-[#E4E4E7]/50 dark:bg-[#09090B]/50 backdrop-blur-md flex items-center h-14 px-8 relative;
+    @apply border border-gray-300 dark:border-gray-800 rounded-lg bg-[#E4E4E7]/20 dark:bg-[#09090B]/50 backdrop-blur-md flex items-center h-14 px-8 relative;
   }
 
   &__logo {
diff --git a/docs/src/theme/Layout/index.js b/docs/src/theme/Layout/index.js
index 15fece0f6..22c4cc131 100644
--- a/docs/src/theme/Layout/index.js
+++ b/docs/src/theme/Layout/index.js
@@ -47,7 +47,7 @@ export default function Layout(props) {
         </ErrorBoundary>
       </div>
 
-      {/* {!noFooter && <Footer />} */}
+      {!noFooter && <Footer />}
     </LayoutProvider>
   );
 }
diff --git a/docs/static/img/homepage/app-base-screen-dark.png b/docs/static/img/homepage/app-base-screen-dark.png
new file mode 100644
index 000000000..b9421e846
Binary files /dev/null and b/docs/static/img/homepage/app-base-screen-dark.png differ
diff --git a/docs/static/img/homepage/app-base-screen-light.png b/docs/static/img/homepage/app-base-screen-light.png
new file mode 100644
index 000000000..c30f8a723
Binary files /dev/null and b/docs/static/img/homepage/app-base-screen-light.png differ