diff --git a/.github/funding.yml b/.github/funding.yml
deleted file mode 100644
index b2ced52..0000000
--- a/.github/funding.yml
+++ /dev/null
@@ -1 +0,0 @@
-ko_fi: howard00
diff --git a/README.md b/README.md
index 322db69..df40a9b 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Video Guide: [YouTube](https://youtu.be/8P3qgVm6m6g)
 ## Demo:
 Production (Latest Docker Image): https://yhw.tw/news
 
-Beta (Beta Docker Image): https://newsbeta.20090526.xyz
+Beta (Beta Docekr Image): https://newsbeta.20090526.xyz
 
 ## Video Guide
 
diff --git a/components/app/windows/news.vue b/components/app/windows/news.vue
index 8ce825a..cb82713 100644
--- a/components/app/windows/news.vue
+++ b/components/app/windows/news.vue
@@ -81,15 +81,7 @@ const updateContent = async (url: string, tabAction: boolean) => {
     const req = await fetch(`/api/home/lt?query=${url.trim()}`);
     const data = await req.json();
     if (data) {
-      // Made by coderabbit: https://github.com/hpware/news-analyze/pull/6#discussion_r2144713017
-      const coolArray = [
-        ...(data.uuidData ?? []),
-        ...(data.nuuiddata?.items ?? []),
-      ];
-      contentArray.value =
-        coolArray.sort(
-          (title1, title2) => title2.publishTimeUnix - title1.publishTimeUnix,
-        ) || [];
+      contentArray.value = [...data.uuidData, ...(data.nuuiddata?.items || [])];
       switchTabs.value = false;
       isDataCached.value = data.cached || false;
       displayTranslateContent.value = false;
diff --git a/components/app/windows/newsView.vue b/components/app/windows/newsView.vue
index 8b0fff2..32a3354 100644
--- a/components/app/windows/newsView.vue
+++ b/components/app/windows/newsView.vue
@@ -1,11 +1,6 @@
 <script setup lang="ts">
 // FOR THIS MODULE DO NOT USE THE ?APPNAME URL TYPE, IT WILL FALL AT ALL TIMES, I HAVE NO CLUE WHY IS BEHAVIOR HAPPENING RN?
-import {
-  SparklesIcon,
-  UserIcon,
-  NewspaperIcon,
-  StarIcon,
-} from "lucide-vue-next";
+import { SparklesIcon, UserIcon, NewspaperIcon } from "lucide-vue-next";
 import translate from "translate";
 
 interface translateInterfaceText {
@@ -183,7 +178,6 @@ const aiSummary = async () => {
           </div>
         </div>
       </div>
-      <button><StarIcon /></button>
     </div>
   </div>
 </template>
diff --git a/components/app/windows/onBoarding.vue b/components/app/windows/onBoarding.vue
index 792f981..df80f06 100644
--- a/components/app/windows/onBoarding.vue
+++ b/components/app/windows/onBoarding.vue
@@ -1,11 +1,9 @@
 <template>
   <!--YouTube Embed-->
-  <div
-    class="justify-center align-center text-center absolute inset-0 flex flex-col mt-12"
-  >
+  <div class="justify-center absolute inset-0 flex flex-col">
     <iframe
-      width="600"
-      height="395"
+      width="560"
+      height="315"
       src="https://www.youtube-nocookie.com/embed/8P3qgVm6m6g?si=0t8eR0wtWv6b3REE"
       title="YouTube video player"
       frameborder="0"
diff --git a/components/app/windows/settings.vue b/components/app/windows/settings.vue
index 4f741e8..cd2dc96 100644
--- a/components/app/windows/settings.vue
+++ b/components/app/windows/settings.vue
@@ -27,10 +27,6 @@ const userData = ref({
 });
 const enteruseremail = ref();
 onMounted(async () => {
-  await validateUserInfo();
-});
-
-const validateUserInfo = async () => {
   const req = await fetch("/api/user/validateUserToken");
   const res = await req.json();
   if (res.current_spot === "LOGOUT") {
@@ -41,12 +37,7 @@ const validateUserInfo = async () => {
   userData.value = res;
   useremail.value = res.email;
   isLoggedIn.value = true;
-};
-
-const intervalTime = 1000 * 60 * 2; // Validate user Info for every ten min while the admin page is opened.
-setInterval(async () => {
-  await validateUserInfo();
-}, intervalTime);
+});
 
 const emit = defineEmits(["windowopener"]);
 
@@ -100,24 +91,22 @@ const checkValidApiKey = () => {
 const showDeleteDialog = ref(false);
 const showLogoutDialog = ref(false);
 const confirmDelete = async () => {
-  showDeleteDialog.value = false;
   await deleteAccount();
-  await validateUserInfo();
+  showDeleteDialog.value = false;
 };
 
 const deleteAccount = async () => {
   const req = await fetch("/api/user/sendUserChanges", {
     method: "DELETE",
   });
-  const res = await req.json();
+  const res = await res.json();
   console.log(res);
 };
 
 const submitChangeAction = async (action: string) => {
-  //const allowedColumns = ["firstname", "email"];
   const actions = [
-    { name: "NAME", SQLSystem: "firstname", sendValue: enterFirstName.value },
-    { name: "USER_EMAIL", SQLSystem: "email", sendValue: enteruseremail.value },
+    { name: "NAME", sendValue: enterFirstName.value },
+    { name: "USER_EMAIL", sendValue: enteruseremail.value },
   ];
 
   const actionMatch = actions.find((a) => a.name === action);
@@ -132,7 +121,7 @@ const submitChangeAction = async (action: string) => {
         "Content-Type": "application/json",
       },
       body: JSON.stringify({
-        action: actionMatch.SQLSystem,
+        action: actionMatch.name,
         value: actionMatch.sendValue,
         jsonValue: "",
       }),
@@ -141,9 +130,7 @@ const submitChangeAction = async (action: string) => {
     const response = await req.json();
     if (response.error) {
       console.error("Error updating user data:", response.error);
-      return;
     }
-    await validateUserInfo();
   } catch (error) {
     console.error("Failed to submit change:", error);
   }
@@ -179,7 +166,6 @@ const submitUserPassword = async () => {
     success.value = true;
     console.log(res);
     userAccount.value = "";
-    await validateUserInfo();
   } else {
     error.value = true;
     errormsg.value = res.error;
diff --git a/components/app/windows/tos.vue b/components/app/windows/tos.vue
index d5b8323..c05d3dd 100644
--- a/components/app/windows/tos.vue
+++ b/components/app/windows/tos.vue
@@ -2,8 +2,5 @@
 const { t } = useI18n();
 </script>
 <template>
-  <div class="justify-center align-center text-center">
-    <h1 class="text-2xl text-bold">{{ t("pages.tos.title") }}</h1>
-    <p>{{ t("pages.tos.content") }}</p>
-  </div>
+  <div></div>
 </template>
diff --git a/createDatabase.ts b/createDatabase.ts
index b4959e4..4ebc340 100644
--- a/createDatabase.ts
+++ b/createDatabase.ts
@@ -54,9 +54,9 @@ const createSources = await sql`
 const createArticlesArchive = await sql`
   create table if not exists news_articles (
   uuid text primary key,
-  article_id text,
+  article_id text primary key,
   jsondata json not null,
-  archive_timestamp timestamp default CURRENT_TIMESTAMP
+  archive_timestamp timestamp default CURRENT_TIMESTAMP,
   )
   `;
 
diff --git a/pages/desktop.vue b/pages/desktop.vue
index 04c70bf..dcc127d 100644
--- a/pages/desktop.vue
+++ b/pages/desktop.vue
@@ -374,9 +374,7 @@ onMounted(async () => {
     if (openApp.value === "newsView") {
       return;
     }
-    setTimeout(() => {
-      openWindow(openApp.value);
-    }, 2000);
+    openWindow(openApp.value);
   }
 });
 
diff --git a/pages/home.vue b/pages/home.vue
index 5b4cb0f..bbe7524 100644
--- a/pages/home.vue
+++ b/pages/home.vue
@@ -132,14 +132,7 @@ useSeoMeta({
         <TooltipProvider>
           <Tooltip>
             <TooltipTrigger>
-              <NuxtLink
-                :to="
-                  localePath({
-                    path: '/desktop',
-                    query: { openapp: 'onboard' },
-                  })
-                "
-              >
+              <NuxtLink :to="localePath('/desktop')">
                 <button
                   class="m-4 mr-1 ml-1 bg-[#8C9393] text-white p-3 rounded-[10px] bg-gradient-to-l from-sky-500 to-purple-600 transition-all duration-150 hover:transform hover:scale-105 hover:shadow-lg"
                 >
diff --git a/server/api/create_database.ts b/server/api/create_database.ts
index bf6fbfb..25f326d 100644
--- a/server/api/create_database.ts
+++ b/server/api/create_database.ts
@@ -34,8 +34,8 @@ export default defineEventHandler(async (event) => {
 
   const createUserOtherData = await sql`
     create table if not exists user_other_data (
-    user_id text primary key,
-    username text not null unique,
+    user_id text primary key ,
+    user text not null unique,
     groq_api_key text,
     starred_news JSON not null,
     translate_provider text,
@@ -51,21 +51,11 @@ export default defineEventHandler(async (event) => {
     )
     `;
 
-  const createArticlesArchive = await sql`
-    create table if not exists news_articles (
-    uuid text primary key,
-    article_id text primary key,
-    jsondata json not null,
-    archive_timestamp timestamp default CURRENT_TIMESTAMP,
-    )
-    `;
-
   return {
     createUsers: createUsers,
     usersList: usersList,
     createUserAiChatHistory: createUserAiChatHistory,
     createSources: createSources,
     createUserOtherData: createUserOtherData,
-    createArticlesArchive: createArticlesArchive,
   };
 });
diff --git a/server/api/download/news-article-archive.json.ts b/server/api/download/news-article-archive.json.ts
deleted file mode 100644
index d07ff91..0000000
--- a/server/api/download/news-article-archive.json.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import sql from "~/server/components/postgres";
-export default defineEventHandler(async (event) => {
-  const articles = await sql`
-    SELECT * FROM news_articles;
-  `;
-  setHeaders(event, {
-    "Content-Type": "application/json",
-    "Content-Disposition": `attachment; filename="news-articles-export-${new Date().toISOString().split("T")[0]}.json"`,
-  });
-  return articles;
-});
diff --git a/server/api/publishers/lt/[slug].ts b/server/api/publishers/lt/[slug].ts
index 722c054..f088046 100644
--- a/server/api/publishers/lt/[slug].ts
+++ b/server/api/publishers/lt/[slug].ts
@@ -1,7 +1,6 @@
 import sql from "~/server/components/postgres";
 import CheckKidUnfriendlyContent from "~/components/checks/checkKidUnfriendlyContent";
 import * as cheerio from "cheerio";
-import { v4 as uuidv4 } from "uuid";
 
 // Caching
 
@@ -92,16 +91,9 @@ export default defineEventHandler(async (event) => {
         });
       }
     });
-    const pushNewsOrg = await sql`
-      insert into lt_news_org (news_id, name, description)
-      values (${uuidv4()}, ${newsOrgName}, ${description})
-      `;
-    console.log(pushNewsOrg);
-    /**
-    *   news_id text primary key,
-    name text not null,
-    description text
-    */
+    /*const pushNewsOrg = await sql`
+      insert into
+      `*/
     cache[slug] = {
       slug: slug,
       title: newsOrgName,
diff --git a/server/api/user/[slug]/isThisArticleStarred.ts b/server/api/user/[slug]/isThisArticleStarred.ts
deleted file mode 100644
index b6d9e5c..0000000
--- a/server/api/user/[slug]/isThisArticleStarred.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import sql from "~/server/components/postgres";
-import getUserTokenMinusSQLInjection from "~/server/components/getUserToken";
-export default defineEventHandler(async (event) => {
-  try {
-    const slug = getRouterParam(event, "slug");
-    const token = await getUserTokenMinusSQLInjection(event);
-    if (token.error.length !== 0) {
-      return {
-        error: token.error,
-      };
-    }
-    const getOtherUserDataJsonFile = await sql`
-      SELECT starred_news from user_other_data
-      where username = ${token.user}
-      `;
-    if (getOtherUserDataJsonFile.length === 0) {
-      return {
-        error: "ERR_NO_DATA",
-      };
-    }
-    const jsonData = getOtherUserDataJsonFile[0].starred_news;
-    return jsonData;
-  } catch (e) {
-    console.log(e);
-    return {
-      error: "INTERNAL_SERVER_ERR",
-      e: e.message,
-    };
-  }
-});
diff --git a/server/api/user/[slug]/star.ts b/server/api/user/[slug]/star.ts
deleted file mode 100644
index b6d9e5c..0000000
--- a/server/api/user/[slug]/star.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import sql from "~/server/components/postgres";
-import getUserTokenMinusSQLInjection from "~/server/components/getUserToken";
-export default defineEventHandler(async (event) => {
-  try {
-    const slug = getRouterParam(event, "slug");
-    const token = await getUserTokenMinusSQLInjection(event);
-    if (token.error.length !== 0) {
-      return {
-        error: token.error,
-      };
-    }
-    const getOtherUserDataJsonFile = await sql`
-      SELECT starred_news from user_other_data
-      where username = ${token.user}
-      `;
-    if (getOtherUserDataJsonFile.length === 0) {
-      return {
-        error: "ERR_NO_DATA",
-      };
-    }
-    const jsonData = getOtherUserDataJsonFile[0].starred_news;
-    return jsonData;
-  } catch (e) {
-    console.log(e);
-    return {
-      error: "INTERNAL_SERVER_ERR",
-      e: e.message,
-    };
-  }
-});
diff --git a/server/api/user/loadInfo.ts b/server/api/user/loadInfo.ts
index 1806233..71188b0 100644
--- a/server/api/user/loadInfo.ts
+++ b/server/api/user/loadInfo.ts
@@ -1,6 +1,7 @@
-/*// Fixed data for testing
+// Fixed data for testing
 export default defineEventHandler(async (event) => {
   return {
+    langPref: "en",
     doNotShowLangPrefPopUp: false,
     email: "test@yuanhau.com",
     name: "Howard",
@@ -12,48 +13,3 @@ export default defineEventHandler(async (event) => {
     },
   };
 });
-*/
-import sql from "~/server/components/postgres";
-import getUserTokenMinusSQLInjection from "~/server/components/getUserToken";
-export default defineEventHandler(async (event) => {
-  try {
-    const token = await getUserTokenMinusSQLInjection(event);
-    if (token.error.length !== 0) {
-      return {
-        error: token.error,
-      };
-    }
-    const fetchMainData = await sql`
-      SELECT * FROM users
-      WHERE username = ${token.user}
-      `;
-    const fetchOtherUserData = await sql`
-      SELECT * FROM user_other_data
-      WHERE username = ${token.user}
-      `;
-
-    if (fetchMainData.length === 0 || fetchOtherUserData.length === 0) {
-      return {
-        error: "ERR_USER_DOESNT_EXIST",
-      };
-    }
-    return {
-      doNotShowLangPrefPopUp:
-        fetchOtherUserData[0].remove_translate_popup || false,
-      email: fetchMainData[0].email || "",
-      name: fetchMainData[0].firstname || "",
-      useCustomGroqKey: +(fetchOtherUserData[0].groq_api_key?.length ?? 0) > 0,
-      translate: {
-        enabled: fetchOtherUserData[0].translate_enabled || false,
-        lang: "en",
-        provider: fetchOtherUserData[0].translate_provider || "google",
-      },
-    };
-  } catch (e) {
-    console.log(e);
-    return {
-      error: "ERR_SERVER_SIDE",
-      e: e.message,
-    };
-  }
-});
diff --git a/server/api/user/login.ts b/server/api/user/login.ts
index 67dfd42..0bd32f1 100644
--- a/server/api/user/login.ts
+++ b/server/api/user/login.ts
@@ -81,9 +81,6 @@ export default defineEventHandler(async (event) => {
           VALUES (${fetchUserInfoAgain[0].username}, ${newToken})
       `;
 
-      const getUserFirstName = await sql`
-        select * from user_other_data`;
-
       setCookie(event, "token", newToken);
       return {
         user: fetchUserInfoAgain,
diff --git a/server/api/user/sendUserChanges.post.ts b/server/api/user/sendUserChanges.post.ts
index 6bbf0da..1dc17a4 100644
--- a/server/api/user/sendUserChanges.post.ts
+++ b/server/api/user/sendUserChanges.post.ts
@@ -12,34 +12,23 @@ export default defineEventHandler(async (event) => {
   const body = await readBody(event);
   if (body.jsonValue.length === 0) {
     const clearBadDataRegex = /[@-_.+a-zA-Z0-9]{2,}/;
+    let allowed = true;
+    if (body.value.match()) {
+      allowed = false;
+    }
     // Use Static values for now.
-    const requestChange = body.action || "";
+    const requestChange = "groq_api_key";
     const apiKeyqq = body.value.match(clearBadDataRegex);
-    const allowedColumns = ["firstname", "email"];
+    const allowedColumns = ["groq_api_key", "another_column_name"];
 
     if (!allowedColumns.includes(requestChange)) {
-      return {
-        error: "ERR_NOT_ALLOWED",
-      };
-    } else if (requestChange === "firstname") {
-      const sqlC = await sql`
-        UPDATE users SET firstname = ${apiKeyqq[0]}
-        WHERE username = ${token.user}`;
-      return {
-        sqlC: sqlC,
-        success: true,
-      };
-    } else if (requestChange === "email") {
-      const sqlC = await sql`
-        UPDATE users SET email = ${apiKeyqq[0]}
-        WHERE username = ${token.user}`;
-      return {
-        sqlC: sqlC,
-        success: true,
-      };
+      throw new Error("Invalid column name provided");
     }
+
     const sqlC = await sql.unsafe(
-      `UPDATE user_other_data SET ${requestChange} = $1 WHERE username = $2`,
+      `
+      UPDATE user_other_data SET ${requestChange} = $1
+      WHERE username = $2`,
       [apiKeyqq[0], token.user],
     );
     return {
diff --git a/server/api/user/validateUserToken.ts b/server/api/user/validateUserToken.ts
index f147a86..76a0fa3 100644
--- a/server/api/user/validateUserToken.ts
+++ b/server/api/user/validateUserToken.ts
@@ -43,7 +43,7 @@ export default defineEventHandler(async (event) => {
   }
   return {
     userAccount: fetchViaSQL[0].username,
-    firstName: "",
+    firstName: fetchViaSQL[0].firstName,
     requested_action: "CONTINUE",
     current_spot: "KEEP_LOGIN",
     email: fetchViaSQL[0].email,