diff --git a/README.md b/README.md
index 0ee9392..236300d 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,15 @@
 <!--Line-->
 <img src="https://user-images.githubusercontent.com/74038190/212284100-561aa473-3905-4a80-b561-0d28506553ee.gif" width="900">
 
+<!--Added Table to show repo statistics-->
+## 📈 GitHub Repository Stats
+| 🌟 **Stars** | 🍴 **Forks** | 🐛 **Issues** | 🔔 **Open PRs** | 🔕 **Closed PRs** | 🛠️ **Languages** | ✅ **Contributors** |
+|--------------|--------------|---------------|-----------------|------------------|------------------|------------------|
+| ![GitHub stars](https://img.shields.io/github/stars/MitulSonagara/truth-tunnel) | ![forks](https://img.shields.io/github/forks/MitulSonagara/truth-tunnel) | ![issues](https://img.shields.io/github/issues/MitulSonagara/truth-tunnel?color=32CD32) | ![pull requests](https://img.shields.io/github/issues-pr/MitulSonagara/truth-tunnel?color=FFFF8F) | ![Closed PRs](https://img.shields.io/github/issues-pr-closed/MitulSonagara/truth-tunnel?color=20B2AA) | ![Languages](https://img.shields.io/github/languages/count/MitulSonagara/truth-tunnel?color=20B2AA) | ![Contributors](https://img.shields.io/github/contributors/MitulSonagara/truth-tunnel?color=00FA9A) |
+
+<!--Line-->
+<img src="https://user-images.githubusercontent.com/74038190/212284100-561aa473-3905-4a80-b561-0d28506553ee.gif" width="900">
+
 <!-- Added Hacktoberfest 2024 and GSSoc Extended 2024 banners -->
 ### This project is now OFFICIALLY accepted for
 
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 243a8c2..d571efc 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -32,7 +32,7 @@ model EncryptionKey {
   publicKey      String @unique
   userId         String @unique @db.ObjectId
   testEncryption String @default("unsecured")
-  user           User   @relation(fields: [userId], references: [id])
+  user           User   @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
 model Message {
@@ -41,7 +41,7 @@ model Message {
   userId    String   @db.ObjectId
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
-  User      User     @relation(fields: [userId], references: [id])
+  User      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
 model Account {
diff --git a/src/app/(app)/dashboard/page.tsx b/src/app/(app)/dashboard/page.tsx
index 4dc94b8..a9a6ee3 100644
--- a/src/app/(app)/dashboard/page.tsx
+++ b/src/app/(app)/dashboard/page.tsx
@@ -3,14 +3,22 @@ import { acceptMessageSchema } from "@/schemas/acceptMessageSchema";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { toast } from "sonner";
 import { useSession } from "next-auth/react";
-import React from "react";
+import React, { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { User } from "next-auth";
 import { Button } from "@/components/ui/button";
 import { Switch } from "@/components/ui/switch";
 import Navbar from "@/components/Navbar";
 import { Separator } from "@/components/ui/separator";
-import { Copy, ListX, Loader2, RefreshCcw, Search } from "lucide-react";
+import {
+  Edit3,
+  GlobeLockIcon,
+  ListX,
+  Loader2,
+  RefreshCcw,
+  Search,
+  Copy,
+} from "lucide-react";
 import { Input } from "@/components/ui/input";
 import { useDeleteModal } from "@/stores/modals-store";
 import GenerateEncryptionAlert from "@/components/alerts/generate-encryption-alert";
@@ -25,13 +33,43 @@ import Messages from "@/components/Messages";
 import { useCheckEncryptionKey } from "@/hooks/check-encryptionkey";
 import { useProfileUrl } from "@/hooks/useProfileUrl";
 
+import checkAndSaveKeys from "@/helpers/checkAndSaveKeys";
+
 import { useSearchSheet } from "@/stores/sheets-store";
 
 const Page = () => {
   const hasEncryptionKey = useCheckEncryptionKey();
 
   const deleteMessagesModal = useDeleteModal();
-  const { data: session, status } = useSession();
+  const { data: session, status, update } = useSession();
+
+  useEffect(() => {
+    const generateKeysIfNeeded = async () => {
+      if (!hasEncryptionKey) {
+        try {
+          // checks and generates key and save in IndexDB
+          const success = await checkAndSaveKeys();
+          if (success) {
+            await update({
+              type: "change_key",
+              key: true,
+            });
+            window.location.reload();
+          } else {
+            toast.error("Error", {
+              description: "Failed to auto generate keys",
+            });
+          }
+        } catch (error) {
+          toast.error("Error", {
+            description: "An unexpected error occurred while generating keys",
+          });
+        }
+      }
+    };
+
+    generateKeysIfNeeded();
+  }, [hasEncryptionKey, update]);
 
   const queryClient = useQueryClient();
   const searchSheet = useSearchSheet();
@@ -110,8 +148,8 @@ const Page = () => {
     <>
       <Navbar />
       <div className="my-8 mt-10 mx-4 md:mx-8 lg:mx-auto p-6 rounded w-screen max-w-6xl">
-        {!user.hasEncryptionKey && <GenerateEncryptionAlert />}
-        {!hasEncryptionKey && <AddEncryptionAlert />}
+        {session && !user.hasEncryptionKey && <GenerateEncryptionAlert />}
+        {session && !hasEncryptionKey && <AddEncryptionAlert />}
         <h1 className="text-4xl font-bold mb-4">Hi {user.username},</h1>
         <div className="mb-4">
           <div className="mt-2 border p-2 rounded-2xl flex items-center gap-3">
diff --git a/src/app/(auth)/sign-in/page.tsx b/src/app/(auth)/sign-in/page.tsx
index fec56cf..fe9e26f 100644
--- a/src/app/(auth)/sign-in/page.tsx
+++ b/src/app/(auth)/sign-in/page.tsx
@@ -24,6 +24,7 @@ import { Eye, EyeOff } from "lucide-react";
 import { Loader2 } from "lucide-react"; // Import Loader component
 import LoaderOverlay from "@/components/Loader";
 import Navbar from "@/components/Navbar";
+import useCheckAndSaveKeys from "@/helpers/checkAndSaveKeys";
 
 const Page = () => {
   const router = useRouter();
@@ -85,7 +86,6 @@ const Page = () => {
         {showLoaderOverlay && <LoaderOverlay />}
         {/* Outer container */}
         <div
-
           className="mt-10 w-full bg-gray-200
          dark:bg-transparent max-w-md border-gray-200
 
@@ -178,19 +178,19 @@ const Page = () => {
 
           {/* Sign Up and Forgot Password */}
           <div className="flex justify-between items-center mt-2">
-  <div className="text-sm">
-    <div>Don{"'"}t have an account?</div>
-    <Link
-      href="/sign-up"
-      className="text-blue-600 hover:text-blue-800"
-    >
-      Sign Up
-    </Link>
-  </div>
-  <div className="text-red-500 text-sm">
-    <Link href="/forgot-password/email">Forgot Password?</Link>
-  </div>
-</div>
+            <div className="text-sm">
+              <div>Don{"'"}t have an account?</div>
+              <Link
+                href="/sign-up"
+                className="text-blue-600 hover:text-blue-800"
+              >
+                Sign Up
+              </Link>
+            </div>
+            <div className="text-red-500 text-sm">
+              <Link href="/forgot-password/email">Forgot Password?</Link>
+            </div>
+          </div>
 
           {/* Back to Home Button */}
           <div className="text-center mt-4">
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index f1b252c..28daf4d 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -9,6 +9,7 @@ import { authOptions } from "./api/auth/[...nextauth]/options";
 import Modals from "@/context/ModalProvider";
 import QueryProvider from "@/context/QueryProvider";
 import NextTopLoader from "nextjs-toploader";
+import Script from "next/script";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -27,11 +28,12 @@ export default async function RootLayout({
   children: React.ReactNode;
 }>) {
   const session = await getServerSession(authOptions);
+
   return (
     <>
       <html lang="en" suppressHydrationWarning>
-        <QueryProvider>
-          <AuthProvider session={session}>
+        <AuthProvider session={session}>
+          <QueryProvider>
             <body className={inter.className}>
               <ThemeProvider
                 attribute="class"
@@ -47,10 +49,29 @@ export default async function RootLayout({
                 {children}
                 <Toaster richColors expand={true} />
                 <Modals />
+                <Script
+                  id="chatbase-full-embed"
+                  strategy="beforeInteractive"
+                  dangerouslySetInnerHTML={{
+                    __html: `
+                      window.embeddedChatbotConfig = {
+                        chatbotId: "R-6622MFJRjEGXxJTsXD4",
+                        domain: "www.chatbase.co"
+                      };
+
+                      (function() {
+                        var s = document.createElement("script");
+                        s.src = "https://www.chatbase.co/embed.min.js";
+                        s.defer = true;
+                        document.body.appendChild(s);
+                      })();
+                    `,
+                  }}
+                />
               </ThemeProvider>
             </body>
-          </AuthProvider>
-        </QueryProvider>
+          </QueryProvider>
+        </AuthProvider>
       </html>
     </>
   );
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index fa3ce81..f033b78 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -23,6 +23,7 @@ const Navbar = () => {
   const { data: session, status } = useSession();
   const loading = status === "loading";
   const loggedIn = !!session;
+
   const usernameChangeModal = useUsernameModal();
   const changeEncryptionKeyModal = useChangeEncryptionKeyModal();
 
diff --git a/src/components/ScrollToTopButton.tsx b/src/components/ScrollToTopButton.tsx
index 15e5bec..975b6c3 100644
--- a/src/components/ScrollToTopButton.tsx
+++ b/src/components/ScrollToTopButton.tsx
@@ -27,7 +27,7 @@ const ScrollToTopButton = () => {
   }, []);
 
   return (
-    <div className="fixed bottom-8 right-8 z-50">
+    <div className="fixed bottom-[80px] right-5 z-50">
       {isVisible && (
         <button
           onClick={scrollToTop}
diff --git a/src/helpers/checkAndSaveKeys.ts b/src/helpers/checkAndSaveKeys.ts
new file mode 100644
index 0000000..c7d331a
--- /dev/null
+++ b/src/helpers/checkAndSaveKeys.ts
@@ -0,0 +1,35 @@
+"use client"
+
+import { savePrivateKey } from "@/lib/indexedDB";
+import { IGenerateKeyWorker } from "@/types/comlinkWorkerTypes";
+import axios from "axios";
+import { wrap } from "comlink";
+
+export default async function checkAndSaveKeys() {
+
+
+  try {
+    console.log("HITTING!")
+    const worker = new Worker(
+      new URL("../workers/crypto.ts", import.meta.url),
+      {
+        type: "module",
+      }
+    );
+
+    const { generateKeyPair } = wrap<IGenerateKeyWorker>(worker);
+
+    const { publicKey, privateKey } = await generateKeyPair();
+    worker.terminate();
+
+    await savePrivateKey(privateKey);
+    // Send public key to server to store it
+    const response = await axios.post("/api/savePublicKey", { publicKey });
+    return true;
+
+  } catch (error) {
+    console.error("Error auto generating keys:", error);
+
+    return false;
+  }
+}
\ No newline at end of file