diff --git a/SurfSense-Frontend b/SurfSense-Frontend
index ccc2c32bb..b4284e400 160000
--- a/SurfSense-Frontend
+++ b/SurfSense-Frontend
@@ -1 +1 @@
-Subproject commit ccc2c32bb16f2856ba6d52d503e9e0ff97708cac
+Subproject commit b4284e4001afc3062549a6faf0bdcc7b6d3b1b3c
diff --git a/extension/public/manifest.json b/extension/public/manifest.json
index 43de8f3ff..1453c3264 100644
--- a/extension/public/manifest.json
+++ b/extension/public/manifest.json
@@ -3,7 +3,7 @@
 
   "name": "SurfSense",
   "description": "Extension to collect Browsing History for SurfSense.",
-  "version": "0.0.1",
+  "version": "0.0.2",
 
   "action": {
     "default_popup": "popup.html"
diff --git a/extension/src/content_script.tsx b/extension/src/content_script.tsx
index ad6a9999d..e69de29bb 100644
--- a/extension/src/content_script.tsx
+++ b/extension/src/content_script.tsx
@@ -1,3 +0,0 @@
-chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) {
-});
-
diff --git a/extension/src/pages/LoginForm.tsx b/extension/src/pages/LoginForm.tsx
index 903e97097..e37def558 100644
--- a/extension/src/pages/LoginForm.tsx
+++ b/extension/src/pages/LoginForm.tsx
@@ -73,7 +73,7 @@ export const LoginForm = () => {
               </h1>
               <form className="space-y-4 md:space-y-6" onSubmit={handleSubmit}>
                 <div>
-                  <label className="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your email</label>
+                  <label className="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Username</label>
                   <input type="text" value={username} onChange={(e) => setUsername(e.target.value)} name="email" id="email" className="bg-gray-50 border border-gray-300 text-gray-900 rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="name" />
                 </div>
                 <div>
diff --git a/extension/src/popup.tsx b/extension/src/popup.tsx
index 1061a861d..52ac93246 100644
--- a/extension/src/popup.tsx
+++ b/extension/src/popup.tsx
@@ -22,9 +22,11 @@ import { API_SECRET_KEY, BACKEND_URL } from "./env";
 export async function clearMem(): Promise<void> {
   try {
 
-    let result = await chrome.storage.local.get(["webhistory"]);
+    let webHistory = await chrome.storage.local.get(["webhistory"]);
+    let urlQueue = await chrome.storage.local.get(["urlQueueList"]);
+    let timeQueue = await chrome.storage.local.get(["timeQueueList"]);
 
-    if (!result.webhistory) {
+    if (!webHistory.webhistory) {
       return
     }
 
@@ -42,7 +44,21 @@ export async function clearMem(): Promise<void> {
 
   
       //Only retain which is still active
-      const newHistory = result.webhistory.map((element: any) => {
+      const newHistory = webHistory.webhistory.map((element: any) => {
+        //@ts-ignore
+        if (actives.includes(element.tabsessionId)) {
+          return element
+        }
+      })
+
+      const newUrlQueue = urlQueue.urlQueueList.map((element: any) => {
+        //@ts-ignore
+        if (actives.includes(element.tabsessionId)) {
+          return element
+        }
+      })
+
+      const newTimeQueue = timeQueue.timeQueueList.map((element: any) => {
         //@ts-ignore
         if (actives.includes(element.tabsessionId)) {
           return element
@@ -51,6 +67,8 @@ export async function clearMem(): Promise<void> {
 
 
       await chrome.storage.local.set({ webhistory: newHistory.filter((item: any) => item) });
+      await chrome.storage.local.set({ urlQueueList: newUrlQueue.filter((item: any) => item) });
+      await chrome.storage.local.set({ timeQueueList: newTimeQueue.filter((item: any) => item) });
 
       toast.info("History Store Deleted!", {
         position: "bottom-center"