diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..1c2fda5
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/ballistic-builder.iml b/.idea/ballistic-builder.iml
new file mode 100644
index 0000000..0b872d8
--- /dev/null
+++ b/.idea/ballistic-builder.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..03d9549
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..859040e
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ballistic-builder.iml" filepath="$PROJECT_DIR$/.idea/ballistic-builder.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..c8397c9
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/app/Accounts/page.tsx b/src/app/Admin/Accounts/page.tsx
similarity index 75%
rename from src/app/Accounts/page.tsx
rename to src/app/Admin/Accounts/page.tsx
index fe76d6e..ec1f0c7 100644
--- a/src/app/Accounts/page.tsx
+++ b/src/app/Admin/Accounts/page.tsx
@@ -1,9 +1,9 @@
 import { accounts } from "@schemas/schema";
 import { getViewAccounts } from "@actions/accountActions";
-import AccountsTable from "@src/components/AccountsTable"; // Adjust the import path as necessary
+import AccountsTable from "@components/AccountsTable"; // Adjust the import path as necessary
 import React, { Suspense } from 'react';
-import { ColumnHeadings } from "@src/lib/utils";
-import PageHero from "@src/components/PageHero";
+import { ColumnHeadings } from "@lib/utils";
+import PageHero from "@components/PageHero";
 
 
 
diff --git a/src/app/Products/grips/page.tsx b/src/app/Products/grips/page.tsx
index 1eb06a0..f6e76a9 100644
--- a/src/app/Products/grips/page.tsx
+++ b/src/app/Products/grips/page.tsx
@@ -3,6 +3,7 @@ import { getGrips } from "@queries/PSA";
 import styles from '../styles.module.css';
 import PageHero from "@components/PageHero";
 import SortTable from "@components/SortTable";
+import {Suspense} from "react";
 
 export default async function GripsPage() {
   const data = await getGrips();
@@ -11,7 +12,9 @@ export default async function GripsPage() {
     <div>
       <PageHero title="Grips" />
       <div className="container mx-auto">
+          <Suspense fallback="Loading...">
         <SortTable data={data}></SortTable>
+          </Suspense>
       </div>
     </div>
   );
diff --git a/src/app/Products/handguards/page.tsx b/src/app/Products/handguards/page.tsx
index a9f0848..093efb8 100644
--- a/src/app/Products/handguards/page.tsx
+++ b/src/app/Products/handguards/page.tsx
@@ -2,6 +2,7 @@ import { getARHandGuards } from "@queries/PSA";
 import styles from '../styles.module.css';
 import PageHero from "@components/PageHero";
 import SortTable from "@components/SortTable";
+import {Suspense} from "react";
 
 export default async function HamdGuardsPage() {
   const data = await getARHandGuards();
@@ -10,7 +11,10 @@ export default async function HamdGuardsPage() {
     <div>
       <PageHero title="Hand Guards" />
       <div className="container mx-auto">
+          <Suspense fallback="Loading...">
         <SortTable data={data}></SortTable>
+          </Suspense>
+
       </div>
     </div>
   );
diff --git a/src/app/Products/lowers/page.tsx b/src/app/Products/lowers/page.tsx
index 0d83109..ada2411 100644
--- a/src/app/Products/lowers/page.tsx
+++ b/src/app/Products/lowers/page.tsx
@@ -3,6 +3,7 @@ import partTypes from 'src/data/parts_cats.json';
 import styles from "../styles.module.css";
 import SortTable from "@components/SortTable";
 import PageHero from "@components/PageHero";
+import {Suspense} from "react";
 
 export default async function LowerReceiverPage() {
   const data = await getProductType(partTypes["AR COMPLETE LOWERS"]);
@@ -11,7 +12,10 @@ export default async function LowerReceiverPage() {
     <div>
            <PageHero title="Lower Recievers" />
       <div className="container mx-auto py-5">
-        <SortTable data={data}></SortTable>      
+          <Suspense fallback="Loading...">
+        <SortTable data={data}></SortTable>
+          </Suspense>
+
       </div>
     </div>
   );
diff --git a/src/app/Products/magazines/page.tsx b/src/app/Products/magazines/page.tsx
index 784793b..b1f4895 100644
--- a/src/app/Products/magazines/page.tsx
+++ b/src/app/Products/magazines/page.tsx
@@ -2,6 +2,7 @@ import { getMags } from "@queries/PSA";
 import styles from '../styles.module.css';
 import PageHero from "@components/PageHero";
 import SortTable from "@components/SortTable";
+import {Suspense} from "react";
 
 export const metadata = {
   title: 'Magazines',
@@ -16,7 +17,10 @@ export default async function MagsPage() {
     <div>
       <PageHero title="Magazines" />
       <div className="container mx-auto">
+          <Suspense fallback="Loading...">
         <SortTable data={data}></SortTable>
+          </Suspense>
+
       </div>
     </div>
   );
diff --git a/src/app/Products/muzzle-devices/page.tsx b/src/app/Products/muzzle-devices/page.tsx
index 97d9518..5dc221d 100644
--- a/src/app/Products/muzzle-devices/page.tsx
+++ b/src/app/Products/muzzle-devices/page.tsx
@@ -3,6 +3,7 @@ import PageHero from "@components/PageHero";
 import styles from '../styles.module.css';
 
 import SortTable from "@components/SortTable";
+import {Suspense} from "react";
 
 export default async function MuzzleDevices() {
   const data = await getMuzzleDevices();
@@ -11,7 +12,9 @@ export default async function MuzzleDevices() {
     <div>
       <PageHero title="Muzzle Devices" />
       <div className="container mx-auto">
+          <Suspense fallback="Loading...">
         <SortTable data={data}></SortTable>
+          </Suspense>
       </div>
     </div>
   );
diff --git a/src/app/Products/optics/page.tsx b/src/app/Products/optics/page.tsx
index 638036e..e231c75 100644
--- a/src/app/Products/optics/page.tsx
+++ b/src/app/Products/optics/page.tsx
@@ -3,6 +3,7 @@ import partTypes from 'src/data/parts_cats.json';
 import styles from '../styles.module.css';
 import PageHero from "@components/PageHero";
 import SortTable from "@components/SortTable";
+import {Suspense} from "react";
 
 export default async function OpticsPage() {
   const psa = await getOptics();
@@ -10,8 +11,11 @@ export default async function OpticsPage() {
   return (
     <div>
       <PageHero title="Optics" />
+
       <div className="container mx-auto">
-       <SortTable data={psa}></SortTable>
+          <Suspense fallback="Loading...">
+          <SortTable data={psa}></SortTable>
+          </Suspense>
       </div>
     </div>
   );
diff --git a/src/app/Products/parts/page.tsx b/src/app/Products/parts/page.tsx
index 10f5f6c..4f46ceb 100644
--- a/src/app/Products/parts/page.tsx
+++ b/src/app/Products/parts/page.tsx
@@ -2,6 +2,7 @@ import { getARParts } from "@queries/PSA";
 import styles from '../styles.module.css';
 import SortTable from "@components/SortTable";
 import PageHero from "@components/PageHero";
+import {Suspense} from "react";
 
 export default async function PartsPage() {
   const data = await getARParts();
@@ -10,7 +11,9 @@ export default async function PartsPage() {
     <div>
       <PageHero title="Parts" />
       <div className="container mx-auto">
+          <Suspense fallback="Loading...">
         <SortTable data={data}></SortTable>
+          </Suspense>
       </div>
     </div>
 
diff --git a/src/app/Products/stocks/page.tsx b/src/app/Products/stocks/page.tsx
index 24ad19d..4c28569 100644
--- a/src/app/Products/stocks/page.tsx
+++ b/src/app/Products/stocks/page.tsx
@@ -3,6 +3,7 @@ import partTypes from 'src/data/parts_cats.json';
 import styles from '../styles.module.css';
 import PageHero from "@components/PageHero";
 import SortTable from "@components/SortTable";
+import {Suspense} from "react";
 
 export default async function StocksPage() {
   const psa = await getStocks();
@@ -10,8 +11,11 @@ export default async function StocksPage() {
   return (
     <div>
       <PageHero title="Stocks" />
+
       <div className="container mx-auto">
-       <SortTable data={psa}></SortTable>
+          <Suspense fallback="Loading...">
+            <SortTable data={psa}></SortTable>
+          </Suspense>
       </div>
     </div>
   );
diff --git a/src/app/Products/triggers/page.tsx b/src/app/Products/triggers/page.tsx
index 050cc7a..8e1b589 100644
--- a/src/app/Products/triggers/page.tsx
+++ b/src/app/Products/triggers/page.tsx
@@ -2,6 +2,7 @@ import { getARTriggers } from "@queries/PSA";
 import styles from '../styles.module.css';
 import PageHero from "@components/PageHero";
 import SortTable from "@components/SortTable";
+import {Suspense} from "react";
 
 export default async function TriggersPage() {
   const data = await getARTriggers();
@@ -10,7 +11,10 @@ export default async function TriggersPage() {
     <div>
       <PageHero title="AR Triggers" />
       <div className="container mx-auto">
+          <Suspense fallback="Loading...">
         <SortTable data={data}></SortTable>
+          </Suspense>
+
       </div>
     </div>
   );
diff --git a/src/app/Products/uppers/page.tsx b/src/app/Products/uppers/page.tsx
index 0687645..b0928ba 100644
--- a/src/app/Products/uppers/page.tsx
+++ b/src/app/Products/uppers/page.tsx
@@ -2,6 +2,7 @@ import { getUpperReciever } from "@queries/PSA";
 import styles from '../styles.module.css';
 import PageHero from "@components/PageHero";
 import SortTable from "@components/SortTable";
+import {Suspense} from "react";
 
 export default async function UpperReceiverPage() {
   const data = await getUpperReciever();
@@ -10,7 +11,9 @@ export default async function UpperReceiverPage() {
     <div>
       <PageHero title="Upper Recievers" />
       <div className="container mx-auto">
+          <Suspense fallback="Loading...">
         <SortTable data={data}></SortTable>
+          </Suspense>
       </div>
     </div>
   );
diff --git a/src/app/userProfile/[uuid]/page.tsx b/src/app/UserProfile/[uuid]/page.tsx
similarity index 100%
rename from src/app/userProfile/[uuid]/page.tsx
rename to src/app/UserProfile/[uuid]/page.tsx
diff --git a/src/components/SortTable/index.tsx b/src/components/SortTable/index.tsx
index ca94d18..1b53b8e 100644
--- a/src/components/SortTable/index.tsx
+++ b/src/components/SortTable/index.tsx
@@ -3,12 +3,12 @@ import { PlusCircleIcon } from "@heroicons/react/20/solid";
 
 import Image from "next/image";
 import Link from "next/link";
-import { TestProductPage } from "../../app/components/TestProductPage";
+import { TestProductPage } from "@src/app/components/TestProductPage";
 
 export default async function SortTable(props: any) {
   return (
     <div className="pb-12">
-   
+
       <div className="mt-8 flow-root">
         <div className="-mx-4 -my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
           <div className="inline-block min-w-full py-2 align-middle sm:px-6 lg:px-8">
@@ -130,11 +130,11 @@ export default async function SortTable(props: any) {
                     <td style={{display:'none'}}>
                     <TestProductPage data={item}></TestProductPage>
                     </td>
-                  </tr>                  
+                  </tr>
                 ))}
               </tbody>
             </table>
-         
+
           </div>
         </div>
       </div>
diff --git a/src/components/footer/index.tsx b/src/components/footer/index.tsx
index 57c0b84..b29f572 100644
--- a/src/components/footer/index.tsx
+++ b/src/components/footer/index.tsx
@@ -12,7 +12,7 @@ const navigation = {
     { name: 'Users', href: '/Admin/Users' },    
   ],
   account: [
-    { name: 'Accounts', href: '/Accounts' },
+    { name: 'Accounts', href: '/Admin/Accounts' },
     { name: 'My Account', href: '/MyAccount' },
     { name: 'Register', href: '/signin' },
     { name: 'Guides', href: '/Guides' },
diff --git a/tsconfig.json b/tsconfig.json
index 066b8d2..db9832b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -44,7 +44,8 @@
       "@components/*": [
         "./src/components/*",
         "./src/components/ui/*",
-        "./src/components/Brands/*"
+        "./src/components/Brands/*",
+        "./src/app/components/*"
       ],
       "@siteInfo/*": [
         "./src/app/(siteInfo)/*",