diff --git a/src/app/account/page.tsx b/src/app/account/page.tsx
index 9595bc5..1b51906 100644
--- a/src/app/account/page.tsx
+++ b/src/app/account/page.tsx
@@ -8,36 +8,39 @@ import FaqBase from '@/components/sections/faq/FaqBase';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import Link from 'next/link';
 
-const assetMap: Record<string, { url: string; alt: string }> = {
-  "gen-stock-rsv-113": { "url": "http://img.b2bpic.net/free-photo/beautiful-woman-with-curly-hair-posing_23-2148973992.jpg", "alt": "Beautiful woman with curly hair posing" },
-  "gen-stock-rsv-118": { "url": "http://img.b2bpic.net/free-photo/fashion-portrait-young-businessman-handsome-model-man-dressed-elegant-blue-suit-gray_158538-11101.jpg", "alt": "Fashion portrait of young businessman handsome model man dressed in elegant blue suit on gray" },
-  "gen-stock-rsv-258": { "url": "http://img.b2bpic.net/free-photo/smiling-young-blonde-call-centre-girl-wearing-headset-sitting-desk-with-work-tools-looking-camera-showing-thumb-up-isolated-green-wall_141793-113773.jpg", "alt": "Smiling young blonde call centre girl wearing headset sitting at desk with work tools looking at camera showing thumb up isolated on green wall" }
-};
+const allNavItems = [
+  { name: "Home", id: "/" },
+  { name: "Account", id: "/account" },
+  { name: "Admin", id: "/admin" },
+  { name: "Cart", id: "/cart" },
+  { name: "Checkout", id: "/checkout" },
+  { name: "Product", id: "/product" },
+  { name: "Return Policy", id: "/return-policy" },
+  { name: "Shipping Policy", id: "/shipping-policy" },
+  { name: "Terms & Conditions", id: "/terms-conditions" }
+];
 
-const getAssetUrl = (id: string) => assetMap[id]?.url || "";
-const getAssetAlt = (id: string) => assetMap[id]?.alt || "";
+const allFooterColumns = [
+  {
+    title: "Site Navigation",    items: [
+      { label: "Home", href: "/" },
+      { label: "Account", href: "/account" },
+      { label: "Admin", href: "/admin" },
+      { label: "Cart", href: "/cart" },
+      { label: "Checkout", href: "/checkout" },
+      { label: "Product", href: "/product" }
+    ]
+  },
+  {
+    title: "Policies",    items: [
+      { label: "Return Policy", href: "/return-policy" },
+      { label: "Shipping Policy", href: "/shipping-policy" },
+      { label: "Terms & Conditions", href: "/terms-conditions" }
+    ]
+  }
+];
 
 export default function AccountPage() {
-  const navItems = [
-    { name: "Checkout", id: "/checkout" },
-    { name: "My Account", id: "/account" }
-  ];
-
-  const footerColumns = [
-    {
-      title: "Pages",      items: [
-        { label: "Checkout", href: "/checkout" },
-        { label: "My Account", href: "/account" }
-      ]
-    },
-    {
-      title: "Legal",      items: [
-        { label: "Privacy Policy", href: "#" }, 
-        { label: "Terms & Conditions", href: "#" }
-      ]
-    }
-  ];
-
   return (
     <ThemeProvider
       defaultButtonVariant={"shift-hover"}
@@ -54,8 +57,8 @@ export default function AccountPage() {
       <div id="nav" data-section="nav">
         <NavbarStyleFullscreen
           brandName="OLIVA"
-          navItems={navItems.map(item => ({ name: item.name, id: item.id }))}
-          button={{ text: "Cart", href: "/cart" }} // Keeping cart button as it's common for e-commerce
+          navItems={allNavItems}
+          button={{ text: "Cart", href: "/cart" }}
         />
       </div>
 
@@ -78,9 +81,9 @@ export default function AccountPage() {
           textboxLayout="default"
           useInvertedBackground={false}
           features={[
-            { id: "feat1", title: "Order History", descriptions: ["Review past purchases and track current orders."], imageSrc: getAssetUrl("gen-stock-rsv-113"), imageAlt: getAssetAlt("gen-stock-rsv-113") },
-            { id: "feat2", title: "Personal Details", descriptions: ["Edit your name, email, password, and communication preferences."], imageSrc: getAssetUrl("gen-stock-rsv-118"), imageAlt: getAssetAlt("gen-stock-rsv-118")},
-            { id: "feat3", title: "Saved Addresses", descriptions: ["Manage multiple shipping and billing addresses for faster checkout."], imageSrc: getAssetUrl("gen-stock-rsv-258"), imageAlt: getAssetAlt("gen-stock-rsv-258") }
+            { id: "feat1", title: "Order History", descriptions: ["Review past purchases and track current orders."], imageSrc: "http://img.b2bpic.net/free-photo/beautiful-woman-with-curly-hair-posing_23-2148973992.jpg", imageAlt: "Beautiful woman with curly hair posing" },
+            { id: "feat2", title: "Personal Details", descriptions: ["Edit your name, email, password, and communication preferences."], imageSrc: "http://img.b2bpic.net/free-photo/fashion-portrait-young-businessman-handsome-model-man-dressed-elegant-blue-suit-gray_158538-11101.jpg", imageAlt: "Fashion portrait of young businessman handsome model man dressed in elegant blue suit on gray"},
+            { id: "feat3", title: "Saved Addresses", descriptions: ["Manage multiple shipping and billing addresses for faster checkout."], imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-blonde-call-centre-girl-wearing-headset-sitting-desk-with-work-tools-looking-camera-showing-thumb-up-isolated-green-wall_141793-113773.jpg", imageAlt: "Smiling young blonde call centre girl wearing headset sitting at desk with work tools looking at camera showing thumb up isolated on green wall" }
           ]}
         />
       </div>
@@ -106,7 +109,7 @@ export default function AccountPage() {
           logoText="OLIVA"
           imageSrc="http://img.b2bpic.net/free-photo/surrealist-portrait-fashionable-woman_23-2149224680.jpg"
           imageAlt="OLIVA fashion brand elegant video"
-          columns={footerColumns}
+          columns={allFooterColumns}
           copyrightText="© 2024 OLIVA | All Rights Reserved."
         />
       </div>