diff --git a/public/data-editor.png b/public/data-editor.png
new file mode 100644
index 00000000..785ce34b
Binary files /dev/null and b/public/data-editor.png differ
diff --git a/public/edit-table.png b/public/edit-table.png
new file mode 100644
index 00000000..48c76a60
Binary files /dev/null and b/public/edit-table.png differ
diff --git a/public/open-source.png b/public/open-source.png
new file mode 100644
index 00000000..99462fd7
Binary files /dev/null and b/public/open-source.png differ
diff --git a/public/screenshot2.png b/public/screenshot2.png
new file mode 100644
index 00000000..b0efc635
Binary files /dev/null and b/public/screenshot2.png differ
diff --git a/public/sql-editor.png b/public/sql-editor.png
new file mode 100644
index 00000000..e2dd159c
Binary files /dev/null and b/public/sql-editor.png differ
diff --git a/src/app/connect/page.tsx b/src/app/connect/page.tsx
new file mode 100644
index 00000000..8d6fd222
--- /dev/null
+++ b/src/app/connect/page.tsx
@@ -0,0 +1,23 @@
+import { Metadata } from "next";
+import dynamic from "next/dynamic";
+
+export const metadata: Metadata = {
+  title: "LibSQL Studio - Fast and powerful LibSQL client on your browser",
+  description:
+    "LibSQL Studio - Fast and powerful LibSQL client on your browser",
+};
+
+const ConnectionConfigScreen = dynamic(
+  () => import("../../components/connection-config-list"),
+  {
+    ssr: false,
+  }
+);
+
+export default function Home() {
+  return (
+    <main className="flex flex-wrap w-screen h-screen justify-center content-center">
+      <ConnectionConfigScreen />
+    </main>
+  );
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 0d08aeae..cb0ac7ad 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,23 +1,228 @@
-import { Metadata } from "next";
-import dynamic from "next/dynamic";
-
-export const metadata: Metadata = {
-  title: "LibSQL Studio - Fast and powerful LibSQL client on your browser",
-  description:
-    "LibSQL Studio - Fast and powerful LibSQL client on your browser",
-};
-
-const ConnectionConfigScreen = dynamic(
-  () => import("../components/connection-config-list"),
-  {
-    ssr: false,
-  }
-);
-
-export default function Home() {
+import Link from "next/link";
+import Script from "next/script";
+import { PropsWithChildren } from "react";
+
+function Topbar() {
+  return (
+    <header className="border-b">
+      <div className="mx-auto container flex">
+        <h1 className="text-lg p-2">
+          LibSQL <strong>Studio</strong>
+        </h1>
+        <div className="grow" />
+        <div className="flex items-center pt-1">
+          <a
+            className="github-button"
+            href="https://github.com/invisal/libsql-studio"
+            data-color-scheme="no-preference: light; light: light; dark: dark;"
+            data-size="large"
+            data-show-count="true"
+            aria-label="Star invisal/libsql-studio on GitHub"
+          >
+            Star
+          </a>
+        </div>
+      </div>
+    </header>
+  );
+}
+
+function LinkButton({ title, url }: Readonly<{ title: string; url: string }>) {
+  return (
+    <Link
+      href={url}
+      className="text-lg px-4 py-2 bg-black text-white rounded-lg hover:bg-gray-700 text-center"
+    >
+      {title}
+    </Link>
+  );
+}
+
+function Footer() {
+  return (
+    <div className="border-t py-4 text-sm">
+      <div className="mx-auto container">© 2024 Visal .In. | LibSQL Studio</div>
+    </div>
+  );
+}
+
+function Screenshot() {
+  return (
+    <div className="my-2 mx-4">
+      <div className="max-w-[800px] mx-auto border-2 border-gray-200 bg-gray-200 rounded-lg overflow-hidden">
+        <div className="h-6 flex items-center">
+          <div className="grow" />
+          <div className="px-2 flex gap-1">
+            <div className="rounded-full h-3 w-3 bg-red-500" />
+            <div className="rounded-full h-3 w-3 bg-yellow-400" />
+            <div className="rounded-full h-3 w-3 bg-green-600" />
+          </div>
+        </div>
+        <img
+          src="/screenshot2.png"
+          className="w-full"
+          alt="LibSQL Studio Powerful Browser Database GUI"
+          style={{ aspectRatio: 1134 / 649 }}
+        />
+      </div>
+    </div>
+  );
+}
+
+function HeroSection() {
+  return (
+    <div className="mx-auto container py-16">
+      <h2 className="text-center text-4xl font-bold">
+        Manage database from browser
+      </h2>
+
+      <p className="text-center max-w-[500px] mx-auto mt-6 text-lg">
+        LibSQL Studio is powerful and lightweight libSQL and Sqlite client that
+        run from your browser. Cross platform and no download needed.
+      </p>
+
+      <div className="flex flex-col gap-4 justify-center mt-8 md:flex-row">
+        <LinkButton title="Connect to LibSQL" url="/connect" />
+        <LinkButton title="Open Sqlite Database" url="#sqlite" />
+      </div>
+    </div>
+  );
+}
+
+function FeatureItem({
+  children,
+  image,
+  reverse,
+}: PropsWithChildren<{ reverse?: boolean; image?: string }>) {
+  return (
+    <div className="flex flex-col md:flex-row gap-8">
+      <div
+        className={
+          reverse
+            ? "md:w-1/2 lg:w-1/2 text-gray-300 flex flex-col justify-center order-1"
+            : "md:w-1/2 lg:w-1/2 text-gray-300 flex flex-col justify-center order-1 lg:order-3"
+        }
+      >
+        {children}
+      </div>
+      <div className="md:w-1/2 lg:w-1/2 order-2">
+        {image ? (
+          <img
+            src={image}
+            className="w-full rounded shadow-lg"
+            alt="Data Editor"
+          />
+        ) : (
+          <div className="h-[300px] bg-gray-500"></div>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export default function MainPage() {
   return (
-    <main className="flex flex-wrap w-screen h-screen justify-center content-center">
-      <ConnectionConfigScreen />
+    <main>
+      <Script async defer src="https://buttons.github.io/buttons.js" />
+      <Topbar />
+      <HeroSection />
+      <Screenshot />
+      <div className="bg-zinc-800 py-12 mt-12">
+        <div className="max-w-[900px] px-4 mx-auto flex flex-col gap-12">
+          <FeatureItem reverse image="/data-editor.png">
+            <h2 className="text-xl mb-4 font-semibold text-white">
+              Powerful Data Editor
+            </h2>
+
+            <div className="flex flex-col gap-4">
+              <p>
+                The handy data editor allows you to add, delete, and edit
+                information.
+              </p>
+
+              <p>
+                Any changes you make in the data editor are saved on your device
+                and can be submitted all at once.
+              </p>
+
+              <p>
+                You can export any table or result set in various formats such
+                as CSV, JSON, and SQL.
+              </p>
+            </div>
+          </FeatureItem>
+
+          <FeatureItem image="/sql-editor.png">
+            <h2 className="text-xl mb-4 font-semibold text-white">
+              Writing and Running SQL
+            </h2>
+
+            <div className="flex flex-col gap-4">
+              <p>
+                LibSQL Studio offers a simple query editor with auto-completion
+                features. You can run multiple queries and view their results
+              </p>
+              <p>Enjoy unlimited query tab.</p>
+            </div>
+          </FeatureItem>
+
+          <FeatureItem reverse image="/edit-table.png">
+            <h2 className="text-xl mb-4 font-semibold text-white">
+              Create and Edit Table
+            </h2>
+            <p>
+              LibSQL Studio allows you to quickly create, modify, and remove
+              table columns with just a few clicks without writing any SQL.
+            </p>
+
+            <p className="mt-4">
+              Before executing, you have the option to preview the SQL script
+              for creating or modifying a table.
+            </p>
+          </FeatureItem>
+
+          <FeatureItem image="/open-source.png">
+            <h2 className="text-xl mb-4 font-semibold text-white">
+              No Download
+            </h2>
+            <p>
+              There is no need to download anything. LibSQL Studio runs directly
+              in your favorite web browser, making it compatible across
+              different platforms.
+            </p>
+
+            <h2 className="text-xl mb-4 font-semibold text-white mt-8">
+              Open Source and Free
+            </h2>
+
+            <p>
+              LibSQL Studio is open source and completely free to use. You have
+              the opportunity to suggest new features or even contribute to
+              adding them yourself.
+            </p>
+          </FeatureItem>
+        </div>
+      </div>
+
+      <div className="bg-zinc-200 p-4">
+        <div className="container mx-auto text-center my-8">
+          <h2 id="sqlite" className="text-2xl font-semibold">
+            Running SQLite in Your Browser
+          </h2>
+          <p className="mt-4 max-w-[500px] mx-auto">
+            Since browser has no file access and sqlite database is a file, we
+            need to run agent to remove this browser restriction.
+          </p>
+
+          <div className="mt-4 max-w-[500px] mx-auto bg-zinc-700 text-left p-2 px-4 text-white rounded">
+            <code>
+              <pre>npx sqlstudio open hello.db</pre>
+            </code>
+          </div>
+        </div>
+      </div>
+
+      <Footer />
     </main>
   );
 }