diff --git a/next/package.json b/next/package.json
index 1056dd49a1..dc9cad5a9c 100644
--- a/next/package.json
+++ b/next/package.json
@@ -26,7 +26,6 @@
     "@splinetool/react-spline": "^2.2.6",
     "@tailwindcss/forms": "^0.5.3",
     "@tanstack/react-query": "^4.29.14",
-    "@tanstack/react-table": "^8.9.3",
     "@trpc/client": "^10.21.1",
     "@trpc/next": "^10.21.1",
     "@trpc/react-query": "^10.21.1",
diff --git a/next/src/components/drawer/LeftSidebar.tsx b/next/src/components/drawer/LeftSidebar.tsx
index 568af4e290..0b68bfa3f9 100644
--- a/next/src/components/drawer/LeftSidebar.tsx
+++ b/next/src/components/drawer/LeftSidebar.tsx
@@ -86,17 +86,14 @@ const LeftSidebar = ({ show, setShow, onReload }: DisplayProps & { onReload?: ()
       <ul role="list" className="flex flex-col">
         <ul className="mb-2">
           <div className="mb-2 ml-2 text-xs font-semibold text-slate-10">Pages</div>
-          {PAGE_LINKS.filter((link) =>
-            typeof link.enabled === "boolean" ? link.enabled : link.enabled(session?.user)
-          ).map((link, i) => (
+          {PAGE_LINKS.map((link, i) => (
             <LinkItem
               key={i}
               title={link.name}
               href={link.href}
               badge={link.badge}
               onClick={() => {
-                console.log(router.pathname, link.href, link.forceRefresh);
-                if (router.pathname === link.href && link.forceRefresh) {
+                if (router.pathname === link.href) {
                   onReload?.();
                   return;
                 }
diff --git a/next/src/components/sidebar/links.tsx b/next/src/components/sidebar/links.tsx
index e242aa44cb..d95b897fd1 100644
--- a/next/src/components/sidebar/links.tsx
+++ b/next/src/components/sidebar/links.tsx
@@ -1,4 +1,3 @@
-import type { User } from "next-auth";
 import type { IconType } from "react-icons";
 import {
   FaBusinessTime,
@@ -15,50 +14,43 @@ import { FaXTwitter } from "react-icons/fa6";
 type LinkMetadata = {
   name: string;
   href: string;
-  forceRefresh?: boolean;
   icon: IconType;
   badge?: {
     text: string;
     className?: string;
   };
   className?: string;
-  enabled: boolean | ((user?: User) => boolean);
 };
+
 export const PAGE_LINKS: LinkMetadata[] = [
   {
     name: "Home",
     href: "/",
     icon: FaHome,
-    enabled: true,
-    forceRefresh: true,
   },
   {
     name: "Help",
     href: "https://docs.reworkd.ai/",
     icon: FaQuestion,
     className: "group-hover:text-red-500",
-    enabled: true,
   },
   {
     name: "Templates",
     href: "/templates",
     icon: FaFileCode,
     className: "transition-transform group-hover:scale-110",
-    enabled: true,
   },
   {
     name: "Settings",
     href: "/settings",
     icon: FaCog,
     className: "transition-transform group-hover:rotate-90",
-    enabled: true,
   },
   {
     name: "Organization",
     href: "/organization",
     icon: FaBusinessTime,
     className: "transition-transform group-hover:scale-110",
-    enabled: (user) => !!user && user.organizations.length > 0,
   },
 ];
 
@@ -67,24 +59,20 @@ export const SOCIAL_LINKS: LinkMetadata[] = [
     name: "Github",
     href: "https://github.com/reworkd/AgentGPT",
     icon: FaGithub,
-    enabled: true,
   },
   {
     name: "Twitter",
     href: "https://twitter.com/ReworkdAI",
     icon: FaXTwitter,
-    enabled: true,
   },
   {
     name: "Discord",
     href: "https://discord.gg/gcmNyAAFfV",
     icon: FaDiscord,
-    enabled: true,
   },
   {
     name: "LinkedIn",
     href: "https://www.linkedin.com/company/reworkd/",
     icon: FaLinkedin,
-    enabled: true,
   },
 ];
diff --git a/next/src/pages/index.tsx b/next/src/pages/index.tsx
index 27c4eba3a4..a40188a435 100644
--- a/next/src/pages/index.tsx
+++ b/next/src/pages/index.tsx
@@ -148,7 +148,7 @@ const Home: NextPage = () => {
       <div id="content" className="flex min-h-screen w-full items-center justify-center">
         <div
           id="layout"
-          className="relative flex h-screen w-full max-w-screen-md flex-col items-center justify-center gap-5 p-2 py-10 sm:gap-3 sm:p-4"
+          className="relative flex h-screen w-full max-w-screen-md flex-col items-center justify-center gap-5 overflow-hidden p-2 py-10 sm:gap-3 sm:p-4"
         >
           {agent !== null ? (
             <Chat
diff --git a/next/src/pages/org/[org].tsx b/next/src/pages/org/[org].tsx
deleted file mode 100644
index e0539359ff..0000000000
--- a/next/src/pages/org/[org].tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { createColumnHelper, getCoreRowModel, useReactTable } from "@tanstack/react-table";
-import type { GetServerSideProps } from "next";
-import { useRouter } from "next/router";
-import { useSession } from "next-auth/react";
-import { serverSideTranslations } from "next-i18next/serverSideTranslations";
-
-import nextI18NextConfig from "../../../next-i18next.config";
-import DashboardLayout from "../../layout/dashboard";
-import { OrganizationApi } from "../../services/api/org";
-import Table from "../../ui/table";
-import { languages } from "../../utils/languages";
-
-const columnHelper = createColumnHelper<{
-  id: string;
-  role: string;
-  user: {
-    id: string;
-    name: string;
-    email: string;
-  };
-}>();
-
-const columns = [
-  columnHelper.accessor("id", {
-    header: "OrgUser",
-  }),
-  columnHelper.accessor("role", {
-    header: "Role",
-  }),
-  columnHelper.accessor("user.name", {
-    header: "User",
-  }),
-];
-
-export default function OrganizationPage() {
-  const { query } = useRouter();
-
-  const { data: session } = useSession();
-  const slug = query.org as string;
-
-  const { data } = useQuery(
-    ["organization", slug],
-    async () => {
-      return await new OrganizationApi(session?.accessToken).get(slug);
-    },
-    {
-      enabled: !!session?.user,
-    }
-  );
-
-  const table = useReactTable({
-    data: data?.users ?? [],
-    columns,
-    getCoreRowModel: getCoreRowModel(),
-  });
-
-  return (
-    <DashboardLayout>
-      <Table table={table} />
-    </DashboardLayout>
-  );
-}
-
-export const getServerSideProps: GetServerSideProps = async ({ locale = "en" }) => {
-  const supportedLocales = languages.map((language) => language.code);
-  const chosenLocale = supportedLocales.includes(locale) ? locale : "en";
-
-  return {
-    props: {
-      ...(await serverSideTranslations(chosenLocale, nextI18NextConfig.ns)),
-    },
-  };
-};
diff --git a/next/src/ui/table.tsx b/next/src/ui/table.tsx
deleted file mode 100644
index 784094f3c2..0000000000
--- a/next/src/ui/table.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { flexRender, Table } from "@tanstack/react-table";
-import type { FC } from "react";
-
-const Table: FC<{ table: Table<any> }> = ({ table }) => (
-  <table>
-    <thead>
-      {table.getHeaderGroups().map((headerGroup) => (
-        <tr key={headerGroup.id}>
-          {headerGroup.headers.map((header) => (
-            <th key={header.id}>
-              {header.isPlaceholder
-                ? null
-                : flexRender(header.column.columnDef.header, header.getContext())}
-            </th>
-          ))}
-        </tr>
-      ))}
-    </thead>
-    <tbody>
-      {table.getRowModel().rows.map((row) => (
-        <tr key={row.id}>
-          {row.getVisibleCells().map((cell) => (
-            <td key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</td>
-          ))}
-        </tr>
-      ))}
-    </tbody>
-  </table>
-);
-
-export default Table;