diff --git a/apps/public/public/clickable-demo.png b/apps/public/public/clickable-demo.png
new file mode 100644
index 00000000..fefdb7c9
Binary files /dev/null and b/apps/public/public/clickable-demo.png differ
diff --git a/apps/public/public/clickhouse.png b/apps/public/public/clickhouse.png
new file mode 100644
index 00000000..c748d0ed
Binary files /dev/null and b/apps/public/public/clickhouse.png differ
diff --git a/apps/public/public/getdreams.png b/apps/public/public/getdreams.png
new file mode 100644
index 00000000..f71225bd
Binary files /dev/null and b/apps/public/public/getdreams.png differ
diff --git a/apps/public/public/kiddokitchen.png b/apps/public/public/kiddokitchen.png
new file mode 100644
index 00000000..9997bb04
Binary files /dev/null and b/apps/public/public/kiddokitchen.png differ
diff --git a/apps/public/src/app/(static)/layout.tsx b/apps/public/src/app/(static)/layout.tsx
new file mode 100644
index 00000000..e3d7d5f9
--- /dev/null
+++ b/apps/public/src/app/(static)/layout.tsx
@@ -0,0 +1,20 @@
+import { Navbar } from '../navbar';
+
+interface Props {
+  children: React.ReactNode;
+}
+
+export default function Layout({ children }: Props) {
+  return (
+    <>
+      <Navbar darkText />
+      <div
+        className="opacity-50 w-full h-screen text-blue-950 bg-[radial-gradient(circle_at_2px_2px,#D9DEF6_2px,transparent_0)] absolute top-0 left-0 right-0 z-0"
+        style={{
+          backgroundSize: '70px 70px',
+        }}
+      />
+      <div className="relative">{children}</div>
+    </>
+  );
+}
diff --git a/apps/public/src/app/privacy/page.tsx b/apps/public/src/app/(static)/privacy/page.tsx
similarity index 99%
rename from apps/public/src/app/privacy/page.tsx
rename to apps/public/src/app/(static)/privacy/page.tsx
index dfb55347..c23157de 100644
--- a/apps/public/src/app/privacy/page.tsx
+++ b/apps/public/src/app/(static)/privacy/page.tsx
@@ -1,4 +1,4 @@
-import { Heading1 } from '../copy';
+import { Heading1 } from '../../copy';
 
 export const dynamic = 'force-dynamic';
 export const revalidate = 3600;
diff --git a/apps/public/src/app/terms/page.tsx b/apps/public/src/app/(static)/terms/page.tsx
similarity index 99%
rename from apps/public/src/app/terms/page.tsx
rename to apps/public/src/app/(static)/terms/page.tsx
index f44c6997..aa592a38 100644
--- a/apps/public/src/app/terms/page.tsx
+++ b/apps/public/src/app/(static)/terms/page.tsx
@@ -1,4 +1,4 @@
-import { Heading1 } from '../copy';
+import { Heading1 } from '../../copy';
 
 export const dynamic = 'force-dynamic';
 export const revalidate = 3600;
diff --git a/apps/public/src/app/hero.tsx b/apps/public/src/app/hero.tsx
index 337cf92e..0d17eabc 100644
--- a/apps/public/src/app/hero.tsx
+++ b/apps/public/src/app/hero.tsx
@@ -1,8 +1,12 @@
+import { Tooltip, TooltipContent } from '@/components/ui/tooltip';
+import { TooltipTrigger } from '@radix-ui/react-tooltip';
 import Image from 'next/image';
 
 import { PreviewCarousel } from './carousel';
 import { Heading1, Lead2 } from './copy';
 import { JoinWaitlistHero } from './join-waitlist-hero';
+import { SocialProofServer } from './social-proof';
+import { SocialProof } from './social-proof/social-proof';
 
 const avatars = [
   'https://api.dicebear.com/7.x/adventurer/svg?seed=Chester&backgroundColor=b6e3f4',
@@ -10,7 +14,7 @@ const avatars = [
   'https://api.dicebear.com/7.x/adventurer/svg?seed=Boo&backgroundColor=ffdfbf',
 ];
 
-export function Hero({ waitlistCount }: { waitlistCount: number }) {
+export function Hero() {
   return (
     <div className="flex py-32 flex-col items-center w-full text-center bg-[#1F54FF] relative overflow-hidden">
       {/* <div className="inset-0 absolute h-full w-full bg-[radial-gradient(circle,rgba(255,255,255,0.1)_0%,rgba(255,255,255,0)_100%)]"></div> */}
@@ -37,16 +41,12 @@ export function Hero({ waitlistCount }: { waitlistCount: number }) {
           alternative to Mixpanel
         </Heading1>
         <Lead2 className="text-white/70 font-light">
-          Mixpanel + Plausible = <span className="text-white">Openpanel!</span>{' '}
-          <br />A simple analytics tool that your wallet can afford.
+          The power of Mixpanel, the ease of Plausible <br />
+          and nothing from Google Analytics 😉
         </Lead2>
         <div className="my-12 w-full flex flex-col items-center">
           <JoinWaitlistHero />
-          <div className="mt-6 flex justify-center items-center">
-            <p className="text-white">
-              {waitlistCount} people have already signed up! 🚀
-            </p>
-          </div>
+          <SocialProofServer className="mt-6" />
         </div>
       </div>
 
diff --git a/apps/public/src/app/join-waitlist-hero.tsx b/apps/public/src/app/join-waitlist-hero.tsx
index caf81a6f..0f602397 100644
--- a/apps/public/src/app/join-waitlist-hero.tsx
+++ b/apps/public/src/app/join-waitlist-hero.tsx
@@ -25,14 +25,14 @@ export function JoinWaitlistHero({ className }: JoinWaitlistProps) {
   useEffect(() => {
     if (open) {
       // @ts-ignore
-      window.op('event', 'waitlist_open');
+      window.op?.('event', 'waitlist_open');
     }
   }, [open]);
 
   useEffect(() => {
     if (success) {
       // @ts-ignore
-      window.op('event', 'waitlist_success', {
+      window.op?.('event', 'waitlist_success', {
         email: value,
       });
     }
@@ -113,15 +113,23 @@ export function JoinWaitlistHero({ className }: JoinWaitlistProps) {
         >
           Join waitlist now
         </Button>
-        <Link
-          href="https://dashboard.openpanel.dev/share/overview/ZQsEhG"
-          target="_blank"
-          rel="nofollow"
-        >
-          <Button size="lg" variant="outline" className="text-lg h-12">
-            Demo
-          </Button>
-        </Link>
+
+        <div className="relative">
+          <Link
+            href="https://dashboard.openpanel.dev/share/overview/ZQsEhG"
+            target="_blank"
+            rel="nofollow"
+          >
+            <Button size="lg" variant="outline" className="text-lg h-12">
+              Demo
+            </Button>
+          </Link>
+          <img
+            src="/clickable-demo.png"
+            className="w-44 shrink-0 absolute left-full -top-8 translate-x-10 max-w-none"
+            alt="Clickable demo button"
+          />
+        </div>
       </div>
     </>
   );
diff --git a/apps/public/src/app/layout.tsx b/apps/public/src/app/layout.tsx
index 2fc3f5ce..ffabec12 100644
--- a/apps/public/src/app/layout.tsx
+++ b/apps/public/src/app/layout.tsx
@@ -35,39 +35,10 @@ export default function RootLayout({
           font.className
         )}
       >
-        <div
-          className="w-full h-screen text-blue-950 bg-[radial-gradient(circle_at_2px_2px,#D9DEF6_2px,transparent_0)] absolute top-0 left-0 right-0 z-0"
-          style={{
-            backgroundSize: '70px 70px',
-          }}
-        />
-        <div className="relative">{children}</div>
+        {children}
         <Footer />
       </body>
-      <Script
-        src="https://openpanel.dev/op.js"
-        async
-        defer
-        strategy="afterInteractive"
-      />
-      <Script
-        id="openpanel"
-        dangerouslySetInnerHTML={{
-          __html: `
-          window.op =
-            window.op ||
-            function (...args) {
-              (window.op.q = window.op.q || []).push(args);
-            };
-          window.op('ctor', {
-            clientId: '301c6dc1-424c-4bc3-9886-a8beab09b615',
-            trackScreenViews: true,
-            trackOutgoingLinks: true,
-            trackAttributes: true,
-          });
-        `,
-        }}
-      />
+      {/* 301c6dc1-424c-4bc3-9886-a8beab09b615 */}
     </html>
   );
 }
diff --git a/apps/public/src/app/navbar.tsx b/apps/public/src/app/navbar.tsx
new file mode 100644
index 00000000..c0df7cf5
--- /dev/null
+++ b/apps/public/src/app/navbar.tsx
@@ -0,0 +1,34 @@
+'use client';
+
+import { Logo } from '@/components/Logo';
+import { cn } from '@/utils/cn';
+import Link from 'next/link';
+import { usePathname } from 'next/navigation';
+
+interface Props {
+  darkText?: boolean;
+  className?: string;
+}
+
+export function Navbar({ darkText = false, className }: Props) {
+  const pathname = usePathname();
+  const textColor = darkText ? 'text-blue-dark' : 'text-white';
+  return (
+    <div
+      className={cn('absolute top-0 left-0 right-0 z-10', textColor, className)}
+    >
+      <div className="container flex justify-between items-center py-4">
+        <Logo />
+        <nav className="flex gap-4">
+          {pathname !== '/' && <Link href="/">Home</Link>}
+          <a href="https://docs.openpanel.dev" target="_blank">
+            Docs
+          </a>
+          <a href="https://dashboard.openpanel.dev" target="_blank">
+            Sign in
+          </a>
+        </nav>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/public/src/app/page.tsx b/apps/public/src/app/page.tsx
index a5d2faf9..efcaea23 100644
--- a/apps/public/src/app/page.tsx
+++ b/apps/public/src/app/page.tsx
@@ -1,18 +1,18 @@
 import { db } from '@openpanel/db';
 
-import { PreviewCarousel } from './carousel';
 import { Heading2, Lead2, Paragraph } from './copy';
 import { Hero } from './hero';
+import { Navbar } from './navbar';
 import { Sections } from './section';
 
 export const dynamic = 'force-dynamic';
 export const revalidate = 3600;
 
-export default async function Page() {
-  const waitlistCount = await db.waitlist.count();
+export default function Page() {
   return (
     <div>
-      <Hero waitlistCount={waitlistCount} />
+      <Navbar darkText={false} className="[&_img]:hidden" />
+      <Hero />
       <div className="container">
         <div className="my-24">
           <Heading2 className="md:text-5xl mb-2 leading-none">
diff --git a/apps/public/src/app/social-proof/index.tsx b/apps/public/src/app/social-proof/index.tsx
new file mode 100644
index 00000000..f0eef0ba
--- /dev/null
+++ b/apps/public/src/app/social-proof/index.tsx
@@ -0,0 +1,17 @@
+import { TooltipProvider } from '@/components/ui/tooltip';
+
+import { db } from '@openpanel/db';
+
+import { SocialProof } from './social-proof';
+
+interface Props {
+  className?: string;
+}
+export async function SocialProofServer(props: Props) {
+  const waitlistCount = await db.waitlist.count();
+  return (
+    <TooltipProvider>
+      <SocialProof count={waitlistCount} {...props} />;
+    </TooltipProvider>
+  );
+}
diff --git a/apps/public/src/app/social-proof/social-proof.tsx b/apps/public/src/app/social-proof/social-proof.tsx
new file mode 100644
index 00000000..91770700
--- /dev/null
+++ b/apps/public/src/app/social-proof/social-proof.tsx
@@ -0,0 +1,72 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { Button } from '@/components/ui/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@/components/ui/tooltip';
+import { cn } from '@/utils/cn';
+import Image from 'next/image';
+
+interface JoinWaitlistProps {
+  className?: string;
+  count: number;
+}
+
+export function SocialProof({ className, count }: JoinWaitlistProps) {
+  return (
+    <div className={cn('flex gap-2 justify-center items-center', className)}>
+      <div className="flex">
+        <Tooltip>
+          <TooltipTrigger>
+            <Image
+              className="rounded-full"
+              src="/clickhouse.png"
+              width={24}
+              height={24}
+              alt="Clickhouse"
+            />
+          </TooltipTrigger>
+          <TooltipContent>Clickhouse is here</TooltipContent>
+        </Tooltip>
+        <Tooltip>
+          <TooltipTrigger className="-mx-3">
+            <Image
+              className="rounded-full"
+              src="/getdreams.png"
+              width={24}
+              height={24}
+              alt="GetDreams"
+            />
+          </TooltipTrigger>
+          <TooltipContent>GetDreams is here</TooltipContent>
+        </Tooltip>
+        <Tooltip>
+          <TooltipTrigger>
+            <Image
+              className="rounded-full"
+              src="/kiddokitchen.png"
+              width={24}
+              height={24}
+              alt="KiddoKitchen"
+            />
+          </TooltipTrigger>
+          <TooltipContent>KiddoKitchen is here</TooltipContent>
+        </Tooltip>
+      </div>
+      <p className="text-white">
+        {count} early birds have already signed up! 🚀
+      </p>
+    </div>
+  );
+}
diff --git a/apps/public/src/components/ui/dialog.tsx b/apps/public/src/components/ui/dialog.tsx
index f8c9d287..f84db214 100644
--- a/apps/public/src/components/ui/dialog.tsx
+++ b/apps/public/src/components/ui/dialog.tsx
@@ -37,7 +37,7 @@ const DialogContent = React.forwardRef<
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg md:w-full',
+        'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-100%] md:translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg md:w-full',
         className
       )}
       {...props}