diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 280c8e4..3ccb8ed 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -18,21 +18,24 @@ const navItems = [
 
 const footerColumns = [
   {
-    title: "Company",
-    items: [
-      { label: "About Us", href: "/about" }
+    title: "Company",    items: [
+      { label: "About Us", href: "/about" },
+      { label: "Careers", href: "/careers" },
+      { label: "Blog", href: "/blog" }
     ],
   },
   {
-    title: "Solutions",
-    items: [
-      { label: "Features", href: "/features" }
+    title: "Solutions",    items: [
+      { label: "Features", href: "/features" },
+      { label: "Pricing", href: "/pricing" },
+      { label: "Integrations", href: "/integrations" }
     ],
   },
   {
-    title: "Support",
-    items: [
-      { label: "Contact Us", href: "/contact" }
+    title: "Support",    items: [
+      { label: "Contact Us", href: "/contact" },
+      { label: "FAQ", href: "/faq" },
+      { label: "Documentation", href: "/docs" }
     ],
   },
 ];
diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index 118ee3e..8f0ee2e 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -4,9 +4,40 @@ import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import { useBlogPosts } from "@/hooks/useBlogPosts";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
+import BlogCardThree from '@/components/sections/blog/BlogCardThree';
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 
+const navItems = [
+    { name: "Home", id: "/" },
+    { name: "About", id: "/about" },
+    { name: "Features", id: "/features" },
+    { name: "Contact", id: "/contact" },
+];
+
+const footerColumns = [
+    {
+        title: "Company",        items: [
+            { label: "About Us", href: "/about" },
+            { label: "Careers", href: "/careers" },
+            { label: "Blog", href: "/blog" }
+        ],
+    },
+    {
+        title: "Solutions",        items: [
+            { label: "Features", href: "/features" },
+            { label: "Pricing", href: "/pricing" },
+            { label: "Integrations", href: "/integrations" }
+        ],
+    },
+    {
+        title: "Support",        items: [
+            { label: "Contact Us", href: "/contact" },
+            { label: "FAQ", href: "/faq" },
+            { label: "Documentation", href: "/docs" }
+        ],
+    },
+];
+
 export default function BlogPage() {
     const { posts, isLoading } = useBlogPosts();
 
@@ -27,15 +58,8 @@ export default function BlogPage() {
                 <div id="nav" data-section="nav">
                     <NavbarLayoutFloatingInline
                         brandName="InnovateSoft"
-                        navItems={[
-                            { name: "Home", id: "/" },
-                            { name: "About", id: "about" },
-                            { name: "Features", id: "features" },
-                            { name: "Solutions", id: "solutions" },
-                            { name: "Pricing", id: "pricing" },
-                            { name: "Contact", id: "contact" },
-                        ]}
-                        button={{ text: "Get Started", href: "#contact" }}
+                        navItems={navItems}
+                        button={{ text: "Get Started", href: "/contact" }}
                     />
                 </div>
 
@@ -45,7 +69,7 @@ export default function BlogPage() {
                         </div>
                     ) : (
                         <div id="blog" data-section="blog">
-                            <BlogCardTwo
+                            <BlogCardThree
                                 blogs={posts}
                                 title="Latest Articles"
                                 description="Insights and updates from our team"
@@ -60,29 +84,7 @@ export default function BlogPage() {
                     <div id="footer" data-section="footer">
                         <FooterBaseCard
                             logoText="InnovateSoft"
-                            columns={[
-                                {
-                                    title: "Company",                                    items: [
-                                        { label: "About Us", href: "/about" },
-                                        { label: "Careers", href: "/careers" },
-                                        { label: "Blog", href: "/blog" },
-                                    ],
-                                },
-                                {
-                                    title: "Solutions",                                    items: [
-                                        { label: "Features", href: "/features" },
-                                        { label: "Pricing", href: "/pricing" },
-                                        { label: "Integrations", href: "/integrations" },
-                                    ],
-                                },
-                                {
-                                    title: "Support",                                    items: [
-                                        { label: "Contact Us", href: "/contact" },
-                                        { label: "FAQ", href: "/faq" },
-                                        { label: "Documentation", href: "/docs" },
-                                    ],
-                                },
-                            ]}
+                            columns={footerColumns}
                             copyrightText="© 2024 InnovateSoft. All rights reserved."
                         />
                     </div>
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 80e1c6a..06af5f9 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -17,21 +17,24 @@ const navItems = [
 
 const footerColumns = [
   {
-    title: "Company",
-    items: [
-      { label: "About Us", href: "/about" }
+    title: "Company",    items: [
+      { label: "About Us", href: "/about" },
+      { label: "Careers", href: "/careers" },
+      { label: "Blog", href: "/blog" }
     ],
   },
   {
-    title: "Solutions",
-    items: [
-      { label: "Features", href: "/features" }
+    title: "Solutions",    items: [
+      { label: "Features", href: "/features" },
+      { label: "Pricing", href: "/pricing" },
+      { label: "Integrations", href: "/integrations" }
     ],
   },
   {
-    title: "Support",
-    items: [
-      { label: "Contact Us", href: "/contact" }
+    title: "Support",    items: [
+      { label: "Contact Us", href: "/contact" },
+      { label: "FAQ", href: "/faq" },
+      { label: "Documentation", href: "/docs" }
     ],
   },
 ];
@@ -96,13 +99,7 @@ export default function ContactPage() {
           title="Trusted by Industry Leaders"
           description="Our innovative solutions are chosen by leading companies worldwide for their reliability and cutting-edge technology."
           logos={[
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-minimalist-abstract-logo-representing--1771432844911-8d92b9d4.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-sleek-modern-logo-for-global-data-inc--1771432852347-870f61af.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-strong-modern-logo-for-cybersecure-co--1771432859676-b2c9c1c0.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/an-innovative-and-clean-logo-for-innovat-1771432867861-19e380e5.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-futuristic-and-dynamic-logo-for-future-1771432874076-9b0b793c.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-clean-cloud-shaped-logo-for-cloud-infr-1771432880896-dce183fb.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-smart-minimalist-logo-for-ai-insights--1771432887864-ccdb5108.png"
+            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-minimalist-abstract-logo-representing--1771432844911-8d92b9d4.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-sleek-modern-logo-for-global-data-inc--1771432852347-870f61af.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-strong-modern-logo-for-cybersecure-co--1771432859676-b2c9c1c0.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/an-innovative-and-clean-logo-for-innovat-1771432867861-19e380e5.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-futuristic-and-dynamic-logo-for-future-1771432874076-9b0b793c.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-clean-cloud-shaped-logo-for-cloud-infr-1771432880896-dce183fb.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-smart-minimalist-logo-for-ai-insights--1771432887864-ccdb5108.png"
           ]}
           speed={40}
           showCard={true}
diff --git a/src/app/features/page.tsx b/src/app/features/page.tsx
index 334ecb3..fd27009 100644
--- a/src/app/features/page.tsx
+++ b/src/app/features/page.tsx
@@ -17,21 +17,24 @@ const navItems = [
 
 const footerColumns = [
   {
-    title: "Company",
-    items: [
-      { label: "About Us", href: "/about" }
+    title: "Company",    items: [
+      { label: "About Us", href: "/about" },
+      { label: "Careers", href: "/careers" },
+      { label: "Blog", href: "/blog" }
     ],
   },
   {
-    title: "Solutions",
-    items: [
-      { label: "Features", href: "/features" }
+    title: "Solutions",    items: [
+      { label: "Features", href: "/features" },
+      { label: "Pricing", href: "/pricing" },
+      { label: "Integrations", href: "/integrations" }
     ],
   },
   {
-    title: "Support",
-    items: [
-      { label: "Contact Us", href: "/contact" }
+    title: "Support",    items: [
+      { label: "Contact Us", href: "/contact" },
+      { label: "FAQ", href: "/faq" },
+      { label: "Documentation", href: "/docs" }
     ],
   },
 ];
@@ -64,20 +67,12 @@ export default function FeaturesPage() {
           description="Compare our advanced solutions against traditional approaches and see the clear difference in performance, scalability, and cost-effectiveness."
           negativeCard={{
             items: [
-              "Outdated legacy systems",
-              "Limited integration capabilities",
-              "High maintenance costs",
-              "Slow implementation times",
-              "Manual, error-prone processes"
+              "Outdated legacy systems",              "Limited integration capabilities",              "High maintenance costs",              "Slow implementation times",              "Manual, error-prone processes"
             ]
           }}
           positiveCard={{
             items: [
-              "Modern, agile platforms",
-              "Seamless API integrations",
-              "Cost-efficient cloud solutions",
-              "Rapid deployment & onboarding",
-              "Automated workflows & AI insights"
+              "Modern, agile platforms",              "Seamless API integrations",              "Cost-efficient cloud solutions",              "Rapid deployment & onboarding",              "Automated workflows & AI insights"
             ]
           }}
           animationType="slide-up"
@@ -106,13 +101,7 @@ export default function FeaturesPage() {
           title="Trusted by Industry Leaders"
           description="Our innovative solutions are chosen by leading companies worldwide for their reliability and cutting-edge technology."
           logos={[
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-minimalist-abstract-logo-representing--1771432844911-8d92b9d4.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-sleek-modern-logo-for-global-data-inc--1771432852347-870f61af.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-strong-modern-logo-for-cybersecure-co--1771432859676-b2c9c1c0.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/an-innovative-and-clean-logo-for-innovat-1771432867861-19e380e5.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-futuristic-and-dynamic-logo-for-future-1771432874076-9b0b793c.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-clean-cloud-shaped-logo-for-cloud-infr-1771432880896-dce183fb.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-smart-minimalist-logo-for-ai-insights--1771432887864-ccdb5108.png"
+            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-minimalist-abstract-logo-representing--1771432844911-8d92b9d4.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-sleek-modern-logo-for-global-data-inc--1771432852347-870f61af.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-strong-modern-logo-for-cybersecure-co--1771432859676-b2c9c1c0.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/an-innovative-and-clean-logo-for-innovat-1771432867861-19e380e5.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-futuristic-and-dynamic-logo-for-future-1771432874076-9b0b793c.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-clean-cloud-shaped-logo-for-cloud-infr-1771432880896-dce183fb.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-smart-minimalist-logo-for-ai-insights--1771432887864-ccdb5108.png"
           ]}
           speed={40}
           showCard={true}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 206495f..405bcbe 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,32 +3,19 @@ import { Instrument_Sans } from "next/font/google";
 import "./globals.css";
 
 const instrumentSans = Instrument_Sans({
-  variable: "--font-instrument-sans",
-  subsets: ["latin"],
+  variable: "--font-instrument-sans",  subsets: ["latin"],
 });
 
 export const metadata: Metadata = {
-  title: "InnovateSoft - Innovative Software Solutions for Your Business",
-  description: "InnovateSoft provides cutting-edge software solutions designed to drive efficiency, foster growth, and empower businesses in the digital age.",
-  keywords: ["software company", "tech solutions", "AI", "machine learning", "cloud computing", "enterprise software", "digital transformation", "business growth", "scalable platforms"],
+  title: "InnovateSoft - Innovative Software Solutions for Your Business",  description: "InnovateSoft provides cutting-edge software solutions designed to drive efficiency, foster growth, and empower businesses in the digital age.",  keywords: ["software company", "tech solutions", "AI", "machine learning", "cloud computing", "enterprise software", "digital transformation", "business growth", "scalable platforms"],
   openGraph: {
-    title: "InnovateSoft - Innovative Software Solutions for Your Business",
-    description: "InnovateSoft provides cutting-edge software solutions designed to drive efficiency, foster growth, and empower businesses in the digital age.",
-    url: "https://innovatesoft.com",
-    siteName: "InnovateSoft",
-    images: [
+    title: "InnovateSoft - Innovative Software Solutions for Your Business",    description: "InnovateSoft provides cutting-edge software solutions designed to drive efficiency, foster growth, and empower businesses in the digital age.",    url: "https://innovatesoft.com",    siteName: "InnovateSoft",    images: [
       {
-        url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-sophisticated-dark-themed-software-das-1771432786667-bad80ef2.png",
-        alt: "Modern software dashboard interface",
-      },
+        url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-sophisticated-dark-themed-software-das-1771432786667-bad80ef2.png",        alt: "Modern software dashboard interface"},
     ],
-    type: "website",
-  },
+    type: "website"},
   twitter: {
-    card: "summary_large_image",
-    title: "InnovateSoft - Innovative Software Solutions for Your Business",
-    description: "InnovateSoft provides cutting-edge software solutions designed to drive efficiency, foster growth, and empower businesses in the digital age.",
-    images: ["https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-sophisticated-dark-themed-software-das-1771432786667-bad80ef2.png"],
+    card: "summary_large_image",    title: "InnovateSoft - Innovative Software Solutions for Your Business",    description: "InnovateSoft provides cutting-edge software solutions designed to drive efficiency, foster growth, and empower businesses in the digital age.",    images: ["https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-sophisticated-dark-themed-software-das-1771432786667-bad80ef2.png"],
   },
   robots: {
     index: true,
diff --git a/src/app/page.tsx b/src/app/page.tsx
index b929637..febb3af 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -21,21 +21,24 @@ const navItems = [
 
 const footerColumns = [
   {
-    title: "Company",
-    items: [
-      { label: "About Us", href: "/about" }
+    title: "Company",    items: [
+      { label: "About Us", href: "/about" },
+      { label: "Careers", href: "/careers" },
+      { label: "Blog", href: "/blog" }
     ],
   },
   {
-    title: "Solutions",
-    items: [
-      { label: "Features", href: "/features" }
+    title: "Solutions",    items: [
+      { label: "Features", href: "/features" },
+      { label: "Pricing", href: "/pricing" },
+      { label: "Integrations", href: "/integrations" }
     ],
   },
   {
-    title: "Support",
-    items: [
-      { label: "Contact Us", href: "/contact" }
+    title: "Support",    items: [
+      { label: "Contact Us", href: "/contact" },
+      { label: "FAQ", href: "/faq" },
+      { label: "Documentation", href: "/docs" }
     ],
   },
 ];
@@ -83,13 +86,7 @@ export default function HomePage() {
           title="Trusted by Industry Leaders"
           description="Our innovative solutions are chosen by leading companies worldwide for their reliability and cutting-edge technology."
           logos={[
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-minimalist-abstract-logo-representing--1771432844911-8d92b9d4.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-sleek-modern-logo-for-global-data-inc--1771432852347-870f61af.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-strong-modern-logo-for-cybersecure-co--1771432859676-b2c9c1c0.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/an-innovative-and-clean-logo-for-innovat-1771432867861-19e380e5.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-futuristic-and-dynamic-logo-for-future-1771432874076-9b0b793c.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-clean-cloud-shaped-logo-for-cloud-infr-1771432880896-dce183fb.png",
-            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-smart-minimalist-logo-for-ai-insights--1771432887864-ccdb5108.png"
+            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-minimalist-abstract-logo-representing--1771432844911-8d92b9d4.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-sleek-modern-logo-for-global-data-inc--1771432852347-870f61af.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-strong-modern-logo-for-cybersecure-co--1771432859676-b2c9c1c0.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/an-innovative-and-clean-logo-for-innovat-1771432867861-19e380e5.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-futuristic-and-dynamic-logo-for-future-1771432874076-9b0b793c.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-clean-cloud-shaped-logo-for-cloud-infr-1771432880896-dce183fb.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_30ordogEOn7VO6LZdIWb5atLXky/a-smart-minimalist-logo-for-ai-insights--1771432887864-ccdb5108.png"
           ]}
           speed={40}
           showCard={true}
@@ -104,20 +101,12 @@ export default function HomePage() {
           description="Compare our advanced solutions against traditional approaches and see the clear difference in performance, scalability, and cost-effectiveness."
           negativeCard={{
             items: [
-              "Outdated legacy systems",
-              "Limited integration capabilities",
-              "High maintenance costs",
-              "Slow implementation times",
-              "Manual, error-prone processes"
+              "Outdated legacy systems",              "Limited integration capabilities",              "High maintenance costs",              "Slow implementation times",              "Manual, error-prone processes"
             ]
           }}
           positiveCard={{
             items: [
-              "Modern, agile platforms",
-              "Seamless API integrations",
-              "Cost-efficient cloud solutions",
-              "Rapid deployment & onboarding",
-              "Automated workflows & AI insights"
+              "Modern, agile platforms",              "Seamless API integrations",              "Cost-efficient cloud solutions",              "Rapid deployment & onboarding",              "Automated workflows & AI insights"
             ]
           }}
           animationType="slide-up"
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index 9e581df..63fbb8c 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -1,181 +1,42 @@
-use client";
+"use client";
 
-import { use, useCallback } from "react";
-import { useRouter } from "next/navigation";
 import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
-import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
-import ProductCart from "@/components/ecommerce/cart/ProductCart";
-import { useProductDetail } from "@/hooks/useProductDetail";
-import { useCart } from "@/hooks/useCart";
-import { useCheckout } from "@/hooks/useCheckout";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 
-interface ProductPageProps {
-    params: Promise<{ id: string }>;
-}
+const navItems = [
+  { name: "Home", id: "/" },
+  { name: "About", id: "/about" },
+  { name: "Features", id: "/features" },
+  { name: "Contact", id: "/contact" }
+];
 
-export default function ProductPage({ params }: ProductPageProps) {
-    const { id } = use(params);
-    const router = useRouter();
-
-    const {
-        product,
-        isLoading,
-        images,
-        meta,
-        variants,
-        quantityVariant,
-        selectedQuantity,
-        createCartItem,
-    } = useProductDetail(id);
-
-    const {
-        items: cartItems,
-        isOpen: cartOpen,
-        setIsOpen: setCartOpen,
-        addItem,
-        updateQuantity,
-        removeItem,
-        total: cartTotal,
-        getCheckoutItems,
-    } = useCart();
-
-    const { buyNow, checkout, isLoading: isCheckoutLoading } = useCheckout();
-
-    const handleAddToCart = useCallback(() => {
-        const item = createCartItem();
-        if (item) {
-            addItem(item);
-        }
-    }, [createCartItem, addItem]);
-
-    const handleBuyNow = useCallback(() => {
-        if (product) {
-            buyNow(product, selectedQuantity);
-        }
-    }, [product, selectedQuantity, buyNow]);
-
-    const handleCheckout = useCallback(async () => {
-        if (cartItems.length === 0) return;
-
-        const currentUrl = new URL(window.location.href);
-        currentUrl.searchParams.set("success", "true");
-
-        await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
-    }, [cartItems, checkout, getCheckoutItems]);
-
-    if (isLoading) {
-        return (
-            <ThemeProvider
-                defaultButtonVariant="shift-hover"
-                defaultTextAnimation="background-highlight"
-                borderRadius="soft"
-                contentWidth="small"
-                sizing="mediumLargeSizeLargeTitles"
-                background="circleGradient"
-                cardStyle="gradient-radial"
-                primaryButtonStyle="shadow"
-                secondaryButtonStyle="layered"
-                headingFontWeight="light"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingInline
-                            brandName="InnovateSoft"
-                            navItems={[
-                                { name: "Home", id: "/" },
-                                { name: "About", id: "about" },
-                                { name: "Features", id: "features" },
-                                { name: "Solutions", id: "solutions" },
-                                { name: "Pricing", id: "pricing" },
-                                { name: "Contact", id: "contact" },
-                                { name: "Shop", id: "/shop" },
-                            ]}
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <div id="loading-state" data-section="loading-state">
-                            <p className="text-foreground">Loading product...</p>
-                        </div>
-                    </main>
-                    <div id="footer" data-section="footer">
-                        <FooterBaseCard
-                            logoText="InnovateSoft"
-                            columns={[
-                                { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Careers", href: "/careers" }, { label: "Blog", href: "/blog" }] },
-                                { title: "Solutions", items: [{ label: "Features", href: "/features" }, { label: "Pricing", href: "/pricing" }, { label: "Integrations", href: "/integrations" }] },
-                                { title: "Support", items: [{ label: "Contact Us", href: "/contact" }, { label: "FAQ", href: "/faq" }, { label: "Documentation", href: "/docs" }] }
-                            ]}
-                            copyrightText="© 2024 InnovateSoft. All rights reserved."
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
-    }
-
-    if (!product) {
-        return (
-            <ThemeProvider
-                defaultButtonVariant="shift-hover"
-                defaultTextAnimation="background-highlight"
-                borderRadius="soft"
-                contentWidth="small"
-                sizing="mediumLargeSizeLargeTitles"
-                background="circleGradient"
-                cardStyle="gradient-radial"
-                primaryButtonStyle="shadow"
-                secondaryButtonStyle="layered"
-                headingFontWeight="light"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingInline
-                            brandName="InnovateSoft"
-                            navItems={[
-                                { name: "Home", id: "/" },
-                                { name: "About", id: "about" },
-                                { name: "Features", id: "features" },
-                                { name: "Solutions", id: "solutions" },
-                                { name: "Pricing", id: "pricing" },
-                                { name: "Contact", id: "contact" },
-                                { name: "Shop", id: "/shop" },
-                            ]}
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <div id="not-found-state" data-section="not-found-state">
-                            <div className="text-center">
-                                <p className="text-foreground mb-4">Product not found</p>
-                                <button
-                                    onClick={() => router.push("/shop")}
-                                    className="primary-button px-6 py-2 rounded-theme"
-                                >
-                                    Back to Shop
-                                </button>
-                            </div>
-                        </div>
-                    </main>
-                    <div id="footer" data-section="footer">
-                        <FooterBaseCard
-                            logoText="InnovateSoft"
-                            columns={[
-                                { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Careers", href: "/careers" }, { label: "Blog", href: "/blog" }] },
-                                { title: "Solutions", items: [{ label: "Features", href: "/features" }, { label: "Pricing", href: "/pricing" }, { label: "Integrations", href: "/integrations" }] },
-                                { title: "Support", items: [{ label: "Contact Us", href: "/contact" }, { label: "FAQ", href: "/faq" }, { label: "Documentation", href: "/docs" }] }
-                            ]}
-                            copyrightText="© 2024 InnovateSoft. All rights reserved."
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
+const footerColumns = [
+    {
+        title: "Company",        items: [
+            { label: "About Us", href: "/about" },
+            { label: "Careers", href: "/careers" },
+            { label: "Blog", href: "/blog" }
+        ]
+    },
+    {
+        title: "Solutions",        items: [
+            { label: "Features", href: "/features" },
+            { label: "Pricing", href: "/pricing" },
+            { label: "Integrations", href: "/integrations" }
+        ]
+    },
+    {
+        title: "Support",        items: [
+            { label: "Contact Us", href: "/contact" },
+            { label: "FAQ", href: "/faq" },
+            { label: "Documentation", href: "/docs" }
+        ]
     }
+];
 
+export default function ProductPage() {
     return (
         <ThemeProvider
             defaultButtonVariant="shift-hover"
@@ -190,65 +51,23 @@ export default function ProductPage({ params }: ProductPageProps) {
             headingFontWeight="light"
         >
             <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                     <NavbarLayoutFloatingInline
                         brandName="InnovateSoft"
-                        navItems={[
-                            { name: "Home", id: "/" },
-                            { name: "About", id: "about" },
-                            { name: "Features", id: "features" },
-                            { name: "Solutions", id: "solutions" },
-                            { name: "Pricing", id: "pricing" },
-                            { name: "Contact", id: "contact" },
-                            { name: "Shop", id: "/shop" },
-                        ]}
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                    />
-                </div>
-                <div id="product-detail-card" data-section="product-detail-card">
-                    <ProductDetailCard
-                        layout="page"
-                        name={product.name}
-                        price={product.price}
-                        salePrice={meta.salePrice}
-                        rating={product.rating || 0}
-                        description={product.description}
-                        images={images}
-                        variants={variants.length > 0 ? variants : undefined}
-                        quantity={quantityVariant}
-                        ribbon={meta.ribbon}
-                        inventoryStatus={meta.inventoryStatus}
-                        inventoryQuantity={meta.inventoryQuantity}
-                        sku={meta.sku}
-                        buttons={[
-                            { text: "Add To Cart", onClick: handleAddToCart },
-                            { text: "Buy Now", onClick: handleBuyNow },
-                        ]}
-                    />
-                </div>
-                <div id="product-cart" data-section="product-cart">
-                    <ProductCart
-                        isOpen={cartOpen}
-                        onClose={() => setCartOpen(false)}
-                        items={cartItems}
-                        onQuantityChange={updateQuantity}
-                        onRemove={removeItem}
-                        total={`$${cartTotal}`}
-                        buttons={[
-                            {
-                                text: isCheckoutLoading ? "Processing..." : "Check Out",                                onClick: handleCheckout,
-                            },
-                        ]}
+                        navItems={navItems}
+                        button={{ text: "Cart", onClick: () => {} }}
                     />
                 </div>
+                <main className="min-h-screen flex items-center justify-center pt-20">
+                     <div id="product-content" data-section="product-content" className="text-center">
+                        <h1 className="text-4xl font-bold mb-4">Product Details</h1>
+                        <p className="text-foreground/80">This product is currently unavailable.</p>
+                    </div>
+                </main>
                 <div id="footer" data-section="footer">
                     <FooterBaseCard
                         logoText="InnovateSoft"
-                        columns={[
-                            { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Careers", href: "/careers" }, { label: "Blog", href: "/blog" }] },
-                            { title: "Solutions", items: [{ label: "Features", href: "/features" }, { label: "Pricing", href: "/pricing" }, { label: "Integrations", href: "/integrations" }] },
-                            { title: "Support", items: [{ label: "Contact Us", href: "/contact" }, { label: "FAQ", href: "/faq" }, { label: "Documentation", href: "/docs" }] }
-                        ]}
+                        columns={footerColumns}
                         copyrightText="© 2024 InnovateSoft. All rights reserved."
                     />
                 </div>
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 3f4de47..9c5c553 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -1,72 +1,42 @@
-use client";
+"use client";
 
 import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
-import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
-import { useProductCatalog } from "@/hooks/useProductCatalog";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 
-export default function ShopPage() {
-    const {
-        products,
-        isLoading,
-        search,
-        setSearch,
-        filters,
-    } = useProductCatalog({ basePath: "/shop" });
+const navItems = [
+  { name: "Home", id: "/" },
+  { name: "About", id: "/about" },
+  { name: "Features", id: "/features" },
+  { name: "Contact", id: "/contact" }
+];
 
-    if (isLoading) {
-        return (
-            <ThemeProvider
-                defaultButtonVariant="shift-hover"
-                defaultTextAnimation="background-highlight"
-                borderRadius="soft"
-                contentWidth="small"
-                sizing="mediumLargeSizeLargeTitles"
-                background="circleGradient"
-                cardStyle="gradient-radial"
-                primaryButtonStyle="shadow"
-                secondaryButtonStyle="layered"
-                headingFontWeight="light"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingInline
-                            brandName="InnovateSoft"
-                            navItems={[
-                                { name: "Home", id: "/" },
-                                { name: "About", id: "about" },
-                                { name: "Features", id: "features" },
-                                { name: "Solutions", id: "solutions" },
-                                { name: "Pricing", id: "pricing" },
-                                { name: "Contact", id: "contact" },
-                                { name: "Shop", id: "/shop" },
-                            ]}
-                            button={{ text: "Cart", onClick: () => {} }}
-                        />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <div id="loading-state" data-section="loading-state">
-                            <p className="text-foreground">Loading products...</p>
-                        </div>
-                    </main>
-                    <div id="footer" data-section="footer">
-                        <FooterBaseCard
-                            logoText="InnovateSoft"
-                            columns={[
-                                { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Careers", href: "/careers" }, { label: "Blog", href: "/blog" }] },
-                                { title: "Solutions", items: [{ label: "Features", href: "/features" }, { label: "Pricing", href: "/pricing" }, { label: "Integrations", href: "/integrations" }] },
-                                { title: "Support", items: [{ label: "Contact Us", href: "/contact" }, { label: "FAQ", href: "/faq" }, { label: "Documentation", href: "/docs" }] }
-                            ]}
-                            copyrightText="© 2024 InnovateSoft. All rights reserved."
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
+const footerColumns = [
+    {
+        title: "Company",        items: [
+            { label: "About Us", href: "/about" },
+            { label: "Careers", href: "/careers" },
+            { label: "Blog", href: "/blog" }
+        ]
+    },
+    {
+        title: "Solutions",        items: [
+            { label: "Features", href: "/features" },
+            { label: "Pricing", href: "/pricing" },
+            { label: "Integrations", href: "/integrations" }
+        ]
+    },
+    {
+        title: "Support",        items: [
+            { label: "Contact Us", href: "/contact" },
+            { label: "FAQ", href: "/faq" },
+            { label: "Documentation", href: "/docs" }
+        ]
     }
+];
 
+export default function ShopPage() {
     return (
         <ThemeProvider
             defaultButtonVariant="shift-hover"
@@ -81,40 +51,23 @@ export default function ShopPage() {
             headingFontWeight="light"
         >
             <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                     <NavbarLayoutFloatingInline
                         brandName="InnovateSoft"
-                        navItems={[
-                            { name: "Home", id: "/" },
-                            { name: "About", id: "about" },
-                            { name: "Features", id: "features" },
-                            { name: "Solutions", id: "solutions" },
-                            { name: "Pricing", id: "pricing" },
-                            { name: "Contact", id: "contact" },
-                            { name: "Shop", id: "/shop" },
-                        ]}
+                        navItems={navItems}
                         button={{ text: "Cart", onClick: () => {} }}
                     />
                 </div>
-                <div id="product-catalog" data-section="product-catalog">
-                    <ProductCatalog
-                        layout="page"
-                        products={products}
-                        searchValue={search}
-                        onSearchChange={setSearch}
-                        searchPlaceholder="Search products..."
-                        filters={filters}
-                        emptyMessage="No products found"
-                    />
-                </div>
+                <main className="min-h-screen flex items-center justify-center pt-20">
+                    <div id="shop-content" data-section="shop-content" className="text-center">
+                        <h1 className="text-4xl font-bold mb-4">Our Shop</h1>
+                        <p className="text-foreground/80">Products are coming soon. Stay tuned!</p>
+                    </div>
+                </main>
                 <div id="footer" data-section="footer">
                     <FooterBaseCard
                         logoText="InnovateSoft"
-                        columns={[
-                            { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Careers", href: "/careers" }, { label: "Blog", href: "/blog" }] },
-                            { title: "Solutions", items: [{ label: "Features", href: "/features" }, { label: "Pricing", href: "/pricing" }, { label: "Integrations", href: "/integrations" }] },
-                            { title: "Support", items: [{ label: "Contact Us", href: "/contact" }, { label: "FAQ", href: "/faq" }, { label: "Documentation", href: "/docs" }] }
-                        ]}
+                        columns={footerColumns}
                         copyrightText="© 2024 InnovateSoft. All rights reserved."
                     />
                 </div>