diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index d9946cd..bbb90e3 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -20,8 +20,7 @@ export default function AboutPage() {
 
   const footerColumns = [
     {
-      title: "Product",
-      items: [
+      title: "Product",      items: [
         { label: "Platform", href: "/optimizer" },
         { label: "Methodology", href: "/methodology" },
         { label: "Pricing", href: "/pricing" },
@@ -29,8 +28,7 @@ export default function AboutPage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
         { label: "Engineering Blog", href: "#" },
         { label: "Case Studies", href: "#" },
@@ -38,8 +36,7 @@ export default function AboutPage() {
       ],
     },
     {
-      title: "Legal",
-      items: [
+      title: "Legal",      items: [
         { label: "Privacy Policy", href: "#" },
         { label: "Terms of Service", href: "#" },
         { label: "Disclaimer", href: "#" },
@@ -63,15 +60,10 @@ export default function AboutPage() {
     >
       <div id="nav" data-section="nav">
         <NavbarLayoutFloatingOverlay
-          navItems={navItems.map((item) => ({
-            name: item.name,
-            id: item.id,
-          }))}
+          navItems={navItems}
           brandName="RetrofitMatrix"
           button={{
-            text: "Start Analysis",
-            href: "/optimizer",
-          }}
+            text: "Start Analysis",            href: "/optimizer"}}
         />
       </div>
 
@@ -85,12 +77,10 @@ export default function AboutPage() {
           tagAnimation="slide-up"
           buttons={[
             {
-              text: "Explore Platform",
-              href: "/optimizer",
-            },
+              text: "Explore Platform",              href: "/optimizer"},
           ]}
           buttonAnimation="slide-up"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/civil-engineers-collaborating-on-structu-1773156702010-b5be620a.png?_wi=3"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/civil-engineers-collaborating-on-structu-1773156702010-b5be620a.png"
           imageAlt="RetrofitMatrix team collaborating on structural analysis"
           mediaAnimation="slide-up"
           ariaLabel="About RetrofitMatrix - hero section"
@@ -105,16 +95,12 @@ export default function AboutPage() {
         <InlineImageSplitTextAbout
           heading={[
             {
-              type: "text",
-              content: "Built on Deep Engineering Expertise and Modern Technology",
-            },
+              type: "text",              content: "Built on Deep Engineering Expertise and Modern Technology"},
           ]}
           useInvertedBackground={false}
           buttons={[
             {
-              text: "View Our Research",
-              href: "#",
-            },
+              text: "View Our Research",              href: "#"},
           ]}
           buttonAnimation="slide-up"
           ariaLabel="About RetrofitMatrix - company mission"
@@ -128,37 +114,16 @@ export default function AboutPage() {
         <FeatureCardTwelve
           features={[
             {
-              id: "precision",
-              label: "Precision",
-              title: "Engineering-Grade Accuracy",
-              items: [
-                "IS 456:2000 compliance",
-                "Validated NDT correlations",
-                "Peer-reviewed methodologies",
-                "Real-world validation data",
-              ],
+              id: "precision",              label: "Precision",              title: "Engineering-Grade Accuracy",              items: [
+                "IS 456:2000 compliance",                "Validated NDT correlations",                "Peer-reviewed methodologies",                "Real-world validation data"],
             },
             {
-              id: "accessibility",
-              label: "Access",
-              title: "Technology for All Engineers",
-              items: [
-                "Intuitive professional interface",
-                "Comprehensive training resources",
-                "Expert support team available",
-                "Flexible deployment options",
-              ],
+              id: "accessibility",              label: "Access",              title: "Technology for All Engineers",              items: [
+                "Intuitive professional interface",                "Comprehensive training resources",                "Expert support team available",                "Flexible deployment options"],
             },
             {
-              id: "innovation",
-              label: "Innovate",
-              title: "Continuously Advancing",
-              items: [
-                "Regular platform updates",
-                "Research partnerships",
-                "New retrofit methodologies",
-                "AI-assisted recommendations",
-              ],
+              id: "innovation",              label: "Innovate",              title: "Continuously Advancing",              items: [
+                "Regular platform updates",                "Research partnerships",                "New retrofit methodologies",                "AI-assisted recommendations"],
             },
           ]}
           animationType="slide-up"
diff --git a/src/app/methodology/page.tsx b/src/app/methodology/page.tsx
index d1dbec2..3a121f3 100644
--- a/src/app/methodology/page.tsx
+++ b/src/app/methodology/page.tsx
@@ -11,17 +11,16 @@ import { Zap, CheckCircle } from "lucide-react";
 
 export default function MethodologyPage() {
   const navItems = [
-    { name: "Home", id: "home" },
-    { name: "Platform", id: "optimizer" },
-    { name: "How It Works", id: "methodology" },
-    { name: "Pricing", id: "pricing" },
-    { name: "About", id: "about" },
+    { name: "Home", id: "/" },
+    { name: "Platform", id: "/optimizer" },
+    { name: "How It Works", id: "/methodology" },
+    { name: "Pricing", id: "/pricing" },
+    { name: "About", id: "/about" },
   ];
 
   const footerColumns = [
     {
-      title: "Product",
-      items: [
+      title: "Product",      items: [
         { label: "Platform", href: "/optimizer" },
         { label: "Methodology", href: "/methodology" },
         { label: "Pricing", href: "/pricing" },
@@ -29,8 +28,7 @@ export default function MethodologyPage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
         { label: "Engineering Blog", href: "#" },
         { label: "Case Studies", href: "#" },
@@ -38,8 +36,7 @@ export default function MethodologyPage() {
       ],
     },
     {
-      title: "Legal",
-      items: [
+      title: "Legal",      items: [
         { label: "Privacy Policy", href: "#" },
         { label: "Terms of Service", href: "#" },
         { label: "Disclaimer", href: "#" },
@@ -66,9 +63,7 @@ export default function MethodologyPage() {
           brandName="RetrofitMatrix"
           navItems={navItems}
           button={{
-            text: "Start Analysis",
-            href: "/optimizer",
-          }}
+            text: "Start Analysis",            href: "/optimizer"}}
         />
       </div>
 
@@ -82,16 +77,12 @@ export default function MethodologyPage() {
           tagAnimation="slide-up"
           buttons={[
             {
-              text: "Request Technical Brief",
-              href: "#contact",
-            },
+              text: "Request Technical Brief",              href: "#contact"},
             {
-              text: "View Case Studies",
-              href: "#",
-            },
+              text: "View Case Studies",              href: "#"},
           ]}
           buttonAnimation="slide-up"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-3d-isometric-view-of-a-reinforced-conc-1773156671407-d5e0b4fe.jpg?_wi=2"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-3d-isometric-view-of-a-reinforced-conc-1773156671407-d5e0b4fe.jpg"
           imageAlt="3D structural analysis visualization"
           mediaAnimation="slide-up"
           ariaLabel="Methodology hero section"
@@ -103,40 +94,16 @@ export default function MethodologyPage() {
         <FeatureCardTwelve
           features={[
             {
-              id: "analysis-methodology",
-              label: "Analysis",
-              title: "Structural Degradation Assessment",
-              items: [
-                "IS 456:2000 strength correlation algorithms",
-                "NDT data integration and validation",
-                "Reinforcement configuration mapping",
-                "Concrete grade estimation",
-                "Failure mode probability analysis",
-              ],
+              id: "analysis-methodology",              label: "Analysis",              title: "Structural Degradation Assessment",              items: [
+                "IS 456:2000 strength correlation algorithms",                "NDT data integration and validation",                "Reinforcement configuration mapping",                "Concrete grade estimation",                "Failure mode probability analysis"],
             },
             {
-              id: "retrofit-methodology",
-              label: "Retrofit",
-              title: "Optimization Algorithm",
-              items: [
-                "Multi-strategy comparative analysis",
-                "Cost-benefit lifecycle calculation",
-                "Durability and sustainability assessment",
-                "Regulatory compliance verification",
-                "Implementation feasibility scoring",
-              ],
+              id: "retrofit-methodology",              label: "Retrofit",              title: "Optimization Algorithm",              items: [
+                "Multi-strategy comparative analysis",                "Cost-benefit lifecycle calculation",                "Durability and sustainability assessment",                "Regulatory compliance verification",                "Implementation feasibility scoring"],
             },
             {
-              id: "validation-methodology",
-              label: "Validation",
-              title: "Quality Assurance & Verification",
-              items: [
-                "Cross-validation with field data",
-                "Industry standard benchmarking",
-                "Expert review protocol",
-                "Continuous model improvement",
-                "Accuracy rate monitoring (92%+ target)",
-              ],
+              id: "validation-methodology",              label: "Validation",              title: "Quality Assurance & Verification",              items: [
+                "Cross-validation with field data",                "Industry standard benchmarking",                "Expert review protocol",                "Continuous model improvement",                "Accuracy rate monitoring (92%+ target)"],
             },
           ]}
           animationType="slide-up"
@@ -153,29 +120,11 @@ export default function MethodologyPage() {
         <MetricCardEleven
           metrics={[
             {
-              id: "metric-1",
-              value: "92%",
-              title: "Prediction Accuracy",
-              description: "Validated against 500+ real-world retrofit projects",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-technical-comparison-chart-showing-fou-1773156670872-02e326e3.jpg?_wi=3",
-              imageAlt: "Retrofit strategy comparison analysis",
-            },
+              id: "metric-1",              value: "92%",              title: "Prediction Accuracy",              description: "Validated against 500+ real-world retrofit projects",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-technical-comparison-chart-showing-fou-1773156670872-02e326e3.jpg",              imageAlt: "Retrofit strategy comparison analysis"},
             {
-              id: "metric-2",
-              value: "40%",
-              title: "Cost Optimization",
-              description: "Average retrofit expenditure reduction vs. traditional methods",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/civil-engineers-collaborating-on-structu-1773156702010-b5be620a.png?_wi=2",
-              imageAlt: "Engineering team collaboration workspace",
-            },
+              id: "metric-2",              value: "40%",              title: "Cost Optimization",              description: "Average retrofit expenditure reduction vs. traditional methods",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/civil-engineers-collaborating-on-structu-1773156702010-b5be620a.png",              imageAlt: "Engineering team collaboration workspace"},
             {
-              id: "metric-3",
-              value: "ISO/IEC",
-              title: "Standards Compliant",
-              description: "Adheres to international engineering standards and best practices",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-modern-structural-analysis-dashboard-s-1773156668765-b6234675.jpg?_wi=3",
-              imageAlt: "Structural analysis dashboard interface",
-            },
+              id: "metric-3",              value: "ISO/IEC",              title: "Standards Compliant",              description: "Adheres to international engineering standards and best practices",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-modern-structural-analysis-dashboard-s-1773156668765-b6234675.jpg",              imageAlt: "Structural analysis dashboard interface"},
           ]}
           animationType="slide-up"
           title="Methodology Validated Results"
diff --git a/src/app/optimizer/page.tsx b/src/app/optimizer/page.tsx
index f86fb8e..3558ff4 100644
--- a/src/app/optimizer/page.tsx
+++ b/src/app/optimizer/page.tsx
@@ -19,8 +19,7 @@ export default function OptimizerPage() {
 
   const footerColumns = [
     {
-      title: "Product",
-      items: [
+      title: "Product",      items: [
         { label: "Platform", href: "/optimizer" },
         { label: "Methodology", href: "/methodology" },
         { label: "Pricing", href: "/pricing" },
@@ -28,8 +27,7 @@ export default function OptimizerPage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
         { label: "Engineering Blog", href: "#" },
         { label: "Case Studies", href: "#" },
@@ -37,8 +35,7 @@ export default function OptimizerPage() {
       ],
     },
     {
-      title: "Legal",
-      items: [
+      title: "Legal",      items: [
         { label: "Privacy Policy", href: "#" },
         { label: "Terms of Service", href: "#" },
         { label: "Disclaimer", href: "#" },
@@ -80,7 +77,7 @@ export default function OptimizerPage() {
             { text: "View Demo", href: "#" },
           ]}
           buttonAnimation="slide-up"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-modern-structural-analysis-dashboard-s-1773156668765-b6234675.jpg?_wi=2"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-modern-structural-analysis-dashboard-s-1773156668765-b6234675.jpg"
           imageAlt="RetrofitMatrix optimizer tool interface"
           mediaAnimation="slide-up"
           ariaLabel="Optimizer tool hero section"
@@ -95,40 +92,16 @@ export default function OptimizerPage() {
         <FeatureCardTwelve
           features={[
             {
-              id: "step-1",
-              label: "Input",
-              title: "Define Structural Parameters",
-              items: [
-                "Beam/column dimensions and geometry",
-                "Reinforcement configuration details",
-                "Original design loads and factors",
-                "Current damage assessment data",
-                "NDT test point measurements",
-              ],
+              id: "step-1",              label: "Input",              title: "Define Structural Parameters",              items: [
+                "Beam/column dimensions and geometry",                "Reinforcement configuration details",                "Original design loads and factors",                "Current damage assessment data",                "NDT test point measurements"],
             },
             {
-              id: "step-2",
-              label: "Analyze",
-              title: "AI-Powered Structural Assessment",
-              items: [
-                "Capacity estimation and degradation modeling",
-                "Failure mode and failure probability analysis",
-                "Retrofit feasibility evaluations",
-                "Material compatibility assessments",
-                "Environmental durability predictions",
-              ],
+              id: "step-2",              label: "Analyze",              title: "AI-Powered Structural Assessment",              items: [
+                "Capacity estimation and degradation modeling",                "Failure mode and failure probability analysis",                "Retrofit feasibility evaluations",                "Material compatibility assessments",                "Environmental durability predictions"],
             },
             {
-              id: "step-3",
-              label: "Optimize",
-              title: "Cost-Benefit Retrofit Recommendations",
-              items: [
-                "Multi-objective optimization algorithms",
-                "Total cost of ownership calculations",
-                "Implementation timeline analysis",
-                "Risk-adjusted performance metrics",
-                "Professional report generation",
-              ],
+              id: "step-3",              label: "Optimize",              title: "Cost-Benefit Retrofit Recommendations",              items: [
+                "Multi-objective optimization algorithms",                "Total cost of ownership calculations",                "Implementation timeline analysis",                "Risk-adjusted performance metrics",                "Professional report generation"],
             },
           ]}
           animationType="slide-up"
@@ -145,22 +118,13 @@ export default function OptimizerPage() {
         <FaqSplitMedia
           faqs={[
             {
-              id: "opt-faq-1",
-              title: "How accurate are the retrofit recommendations?",
-              content: "Our optimization engine has been validated against 500+ real-world retrofit projects with 92% correlation to post-implementation performance. Recommendations are based on IS 456:2000 standards and advanced structural mechanics.",
-            },
+              id: "opt-faq-1",              title: "How accurate are the retrofit recommendations?",              content: "Our optimization engine has been validated against 500+ real-world retrofit projects with 92% correlation to post-implementation performance. Recommendations are based on IS 456:2000 standards and advanced structural mechanics."},
             {
-              id: "opt-faq-2",
-              title: "What file formats are supported for data import?",
-              content: "The platform accepts CSV, Excel, JSON, and direct manual entry. For NDT data, we support standard rebound hammer formats and can integrate with common inspection software outputs.",
-            },
+              id: "opt-faq-2",              title: "What file formats are supported for data import?",              content: "The platform accepts CSV, Excel, JSON, and direct manual entry. For NDT data, we support standard rebound hammer formats and can integrate with common inspection software outputs."},
             {
-              id: "opt-faq-3",
-              title: "Can I compare multiple retrofit scenarios?",
-              content: "Yes. The optimizer allows unlimited scenario comparison. Save baselines, modify parameters, and generate side-by-side cost-benefit analyses for board presentations and client discussions.",
-            },
+              id: "opt-faq-3",              title: "Can I compare multiple retrofit scenarios?",              content: "Yes. The optimizer allows unlimited scenario comparison. Save baselines, modify parameters, and generate side-by-side cost-benefit analyses for board presentations and client discussions."},
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-technical-comparison-chart-showing-fou-1773156670872-02e326e3.jpg?_wi=2"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-technical-comparison-chart-showing-fou-1773156670872-02e326e3.jpg"
           imageAlt="Retrofit optimization comparison analysis"
           mediaAnimation="slide-up"
           mediaPosition="left"
diff --git a/src/app/page.tsx b/src/app/page.tsx
index bad860a..33eae2d 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -24,8 +24,7 @@ export default function HomePage() {
 
   const footerColumns = [
     {
-      title: "Product",
-      items: [
+      title: "Product",      items: [
         { label: "Platform", href: "/optimizer" },
         { label: "Methodology", href: "/methodology" },
         { label: "Pricing", href: "/pricing" },
@@ -33,8 +32,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
         { label: "Engineering Blog", href: "#" },
         { label: "Case Studies", href: "#" },
@@ -42,8 +40,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Legal",
-      items: [
+      title: "Legal",      items: [
         { label: "Privacy Policy", href: "#" },
         { label: "Terms of Service", href: "#" },
         { label: "Disclaimer", href: "#" },
@@ -92,22 +89,16 @@ export default function HomePage() {
             { text: "Learn More", href: "#about" },
           ]}
           buttonAnimation="slide-up"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-modern-structural-analysis-dashboard-s-1773156668765-b6234675.jpg?_wi=1"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-modern-structural-analysis-dashboard-s-1773156668765-b6234675.jpg"
           imageAlt="RetrofitMatrix structural analysis dashboard interface"
           mediaAnimation="slide-up"
           avatars={[
             {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-senior-struct-1773156673665-8acc0972.jpg",
-              alt: "Senior Structural Engineer",
-            },
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-senior-struct-1773156673665-8acc0972.jpg",              alt: "Senior Structural Engineer"},
             {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-project-manag-1773156671327-92ddcf2e.jpg",
-              alt: "Project Manager",
-            },
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-project-manag-1773156671327-92ddcf2e.jpg",              alt: "Project Manager"},
             {
-              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-senior-techni-1773156670614-35863201.jpg",
-              alt: "Technical Director",
-            },
+              src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-senior-techni-1773156670614-35863201.jpg",              alt: "Technical Director"},
           ]}
           avatarText="Trusted by Leading Infrastructure Companies"
           ariaLabel="Hero section - RetrofitMatrix structural retrofit platform"
@@ -122,20 +113,14 @@ export default function HomePage() {
         <InlineImageSplitTextAbout
           heading={[
             {
-              type: "text",
-              content: "Enterprise-Grade Structural Analysis for",
-            },
+              type: "text",              content: "Enterprise-Grade Structural Analysis for"},
             {
-              type: "text",
-              content: "Infrastructure Resilience",
-            },
+              type: "text",              content: "Infrastructure Resilience"},
           ]}
           useInvertedBackground={false}
           buttons={[
             {
-              text: "Explore Platform",
-              href: "/optimizer",
-            },
+              text: "Explore Platform",              href: "/optimizer"},
           ]}
           buttonAnimation="slide-up"
           ariaLabel="About RetrofitMatrix - structural analysis platform"
@@ -149,40 +134,16 @@ export default function HomePage() {
         <FeatureCardTwelve
           features={[
             {
-              id: "structural-analysis",
-              label: "Analysis",
-              title: "Comprehensive Structural Assessment",
-              items: [
-                "RCC beam and column evaluation",
-                "Geometry and reinforcement mapping",
-                "Rebound hammer NDT integration",
-                "Strength degradation estimation",
-                "Failure mode prediction",
-              ],
+              id: "structural-analysis",              label: "Analysis",              title: "Comprehensive Structural Assessment",              items: [
+                "RCC beam and column evaluation",                "Geometry and reinforcement mapping",                "Rebound hammer NDT integration",                "Strength degradation estimation",                "Failure mode prediction"],
             },
             {
-              id: "retrofit-optimization",
-              label: "Retrofit",
-              title: "Optimized Strengthening Strategies",
-              items: [
-                "GFRP wrapping simulation",
-                "CFRP wrapping analysis",
-                "FRP laminate recommendations",
-                "RC jacketing evaluation",
-                "Cost-benefit comparison",
-              ],
+              id: "retrofit-optimization",              label: "Retrofit",              title: "Optimized Strengthening Strategies",              items: [
+                "GFRP wrapping simulation",                "CFRP wrapping analysis",                "FRP laminate recommendations",                "RC jacketing evaluation",                "Cost-benefit comparison"],
             },
             {
-              id: "3d-visualization",
-              label: "3D View",
-              title: "Interactive Structural Visualization",
-              items: [
-                "Real-time 3D model rendering",
-                "Reinforcement bar visualization",
-                "Test point mapping",
-                "Stress distribution display",
-                "Retrofit layer visualization",
-              ],
+              id: "3d-visualization",              label: "3D View",              title: "Interactive Structural Visualization",              items: [
+                "Real-time 3D model rendering",                "Reinforcement bar visualization",                "Test point mapping",                "Stress distribution display",                "Retrofit layer visualization"],
             },
           ]}
           animationType="slide-up"
@@ -199,29 +160,11 @@ export default function HomePage() {
         <MetricCardEleven
           metrics={[
             {
-              id: "metric-1",
-              value: "500+",
-              title: "Structures Analyzed",
-              description: "Successful retrofit assessments completed",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-3d-isometric-view-of-a-reinforced-conc-1773156671407-d5e0b4fe.jpg?_wi=1",
-              imageAlt: "3D structural analysis visualization",
-            },
+              id: "metric-1",              value: "500+",              title: "Structures Analyzed",              description: "Successful retrofit assessments completed",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-3d-isometric-view-of-a-reinforced-conc-1773156671407-d5e0b4fe.jpg",              imageAlt: "3D structural analysis visualization"},
             {
-              id: "metric-2",
-              value: "92%",
-              title: "Accuracy Rate",
-              description: "NDT correlation validation across projects",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-technical-comparison-chart-showing-fou-1773156670872-02e326e3.jpg?_wi=1",
-              imageAlt: "Retrofit strategy comparison analysis",
-            },
+              id: "metric-2",              value: "92%",              title: "Accuracy Rate",              description: "NDT correlation validation across projects",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-technical-comparison-chart-showing-fou-1773156670872-02e326e3.jpg",              imageAlt: "Retrofit strategy comparison analysis"},
             {
-              id: "metric-3",
-              value: "40%",
-              title: "Cost Optimization",
-              description: "Average retrofit expenditure reduction achieved",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/civil-engineers-collaborating-on-structu-1773156702010-b5be620a.png?_wi=1",
-              imageAlt: "Engineering team collaboration workspace",
-            },
+              id: "metric-3",              value: "40%",              title: "Cost Optimization",              description: "Average retrofit expenditure reduction achieved",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/civil-engineers-collaborating-on-structu-1773156702010-b5be620a.png",              imageAlt: "Engineering team collaboration workspace"},
           ]}
           animationType="slide-up"
           title="Platform Impact"
@@ -237,52 +180,26 @@ export default function HomePage() {
         <PricingCardTwo
           plans={[
             {
-              id: "professional",
-              badge: "Professional",
-              badgeIcon: CheckCircle,
-              price: "Contact Sales",
-              subtitle: "For independent structural engineers",
-              buttons: [
+              id: "professional",              badge: "Professional",              badgeIcon: CheckCircle,
+              price: "Contact Sales",              subtitle: "For independent structural engineers",              buttons: [
                 {
-                  text: "Request Demo",
-                  href: "#contact",
-                },
+                  text: "Request Demo",                  href: "#contact"},
                 {
-                  text: "Learn More",
-                },
+                  text: "Learn More"},
               ],
               features: [
-                "5 analyses per month",
-                "Basic 3D visualization",
-                "NDT data import",
-                "Email support",
-                "Standard reports",
-              ],
+                "5 analyses per month",                "Basic 3D visualization",                "NDT data import",                "Email support",                "Standard reports"],
             },
             {
-              id: "enterprise",
-              badge: "Enterprise",
-              badgeIcon: CheckCircle,
-              price: "Custom",
-              subtitle: "For EPC companies and large consultancies",
-              buttons: [
+              id: "enterprise",              badge: "Enterprise",              badgeIcon: CheckCircle,
+              price: "Custom",              subtitle: "For EPC companies and large consultancies",              buttons: [
                 {
-                  text: "Schedule Call",
-                  href: "#contact",
-                },
+                  text: "Schedule Call",                  href: "#contact"},
                 {
-                  text: "Pitch Deck",
-                },
+                  text: "Pitch Deck"},
               ],
               features: [
-                "Unlimited analyses",
-                "Advanced 3D rendering",
-                "Multi-project dashboard",
-                "API integration",
-                "Priority 24/7 support",
-                "Custom reporting",
-                "Team collaboration tools",
-              ],
+                "Unlimited analyses",                "Advanced 3D rendering",                "Multi-project dashboard",                "API integration",                "Priority 24/7 support",                "Custom reporting",                "Team collaboration tools"],
             },
           ]}
           animationType="slide-up"
@@ -299,53 +216,17 @@ export default function HomePage() {
         <TestimonialCardSix
           testimonials={[
             {
-              id: "1",
-              name: "Rajesh Kumar",
-              handle: "Senior Structural Engineer, L&T",
-              testimonial: "RetrofitMatrix streamlined our retrofit decision process. The 3D visualization and multi-strategy comparison saved us weeks on complex assessments.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-senior-struct-1773156673665-8acc0972.jpg?_wi=1",
-              imageAlt: "Rajesh Kumar",
-            },
+              id: "1",              name: "Rajesh Kumar",              handle: "Senior Structural Engineer, L&T",              testimonial: "RetrofitMatrix streamlined our retrofit decision process. The 3D visualization and multi-strategy comparison saved us weeks on complex assessments.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-senior-struct-1773156673665-8acc0972.jpg",              imageAlt: "Rajesh Kumar"},
             {
-              id: "2",
-              name: "Priya Deshmukh",
-              handle: "Project Manager, Afcons",
-              testimonial: "The NDT integration is seamless and the cost optimization recommendations have improved our project economics significantly.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-project-manag-1773156671327-92ddcf2e.jpg?_wi=1",
-              imageAlt: "Priya Deshmukh",
-            },
+              id: "2",              name: "Priya Deshmukh",              handle: "Project Manager, Afcons",              testimonial: "The NDT integration is seamless and the cost optimization recommendations have improved our project economics significantly.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-project-manag-1773156671327-92ddcf2e.jpg",              imageAlt: "Priya Deshmukh"},
             {
-              id: "3",
-              name: "Vikram Sharma",
-              handle: "Technical Director, Tata Projects",
-              testimonial: "Enterprise-grade reliability with the technical depth engineers demand. A game-changer for infrastructure retrofit planning.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-senior-techni-1773156670614-35863201.jpg",
-              imageAlt: "Vikram Sharma",
-            },
+              id: "3",              name: "Vikram Sharma",              handle: "Technical Director, Tata Projects",              testimonial: "Enterprise-grade reliability with the technical depth engineers demand. A game-changer for infrastructure retrofit planning.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-senior-techni-1773156670614-35863201.jpg",              imageAlt: "Vikram Sharma"},
             {
-              id: "4",
-              name: "Ananya Patel",
-              handle: "Chief Structural Consultant",
-              testimonial: "The platform's accuracy in failure mode prediction has become critical to our safety assessments. Highly recommend for any infrastructure company.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-structural-co-1773156701406-fb54a86c.png",
-              imageAlt: "Ananya Patel",
-            },
+              id: "4",              name: "Ananya Patel",              handle: "Chief Structural Consultant",              testimonial: "The platform's accuracy in failure mode prediction has become critical to our safety assessments. Highly recommend for any infrastructure company.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-structural-co-1773156701406-fb54a86c.png",              imageAlt: "Ananya Patel"},
             {
-              id: "5",
-              name: "Rohit Singh",
-              handle: "Infrastructure Technology Lead",
-              testimonial: "We've integrated RetrofitMatrix into our standard retrofit workflow. The ROI is exceptional and the support team is outstanding.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-senior-struct-1773156673665-8acc0972.jpg?_wi=2",
-              imageAlt: "Rohit Singh",
-            },
+              id: "5",              name: "Rohit Singh",              handle: "Infrastructure Technology Lead",              testimonial: "We've integrated RetrofitMatrix into our standard retrofit workflow. The ROI is exceptional and the support team is outstanding.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-senior-struct-1773156673665-8acc0972.jpg",              imageAlt: "Rohit Singh"},
             {
-              id: "6",
-              name: "Meera Iyer",
-              handle: "Structural Engineering Manager",
-              testimonial: "Finally, a platform that understands the complexity of real-world concrete degradation. The recommendations are scientifically sound and practically implementable.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-project-manag-1773156671327-92ddcf2e.jpg?_wi=2",
-              imageAlt: "Meera Iyer",
-            },
+              id: "6",              name: "Meera Iyer",              handle: "Structural Engineering Manager",              testimonial: "Finally, a platform that understands the complexity of real-world concrete degradation. The recommendations are scientifically sound and practically implementable.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/professional-headshot-of-a-project-manag-1773156671327-92ddcf2e.jpg",              imageAlt: "Meera Iyer"},
           ]}
           animationType="slide-up"
           title="Trusted by Engineering Leaders"
@@ -362,37 +243,19 @@ export default function HomePage() {
         <FaqSplitMedia
           faqs={[
             {
-              id: "faq-1",
-              title: "What structural elements does RetrofitMatrix analyze?",
-              content: "RetrofitMatrix currently focuses on reinforced concrete (RCC) beams and columns. The platform evaluates geometry, reinforcement configuration, concrete grade, and steel properties to predict structural capacity and degradation.",
-            },
+              id: "faq-1",              title: "What structural elements does RetrofitMatrix analyze?",              content: "RetrofitMatrix currently focuses on reinforced concrete (RCC) beams and columns. The platform evaluates geometry, reinforcement configuration, concrete grade, and steel properties to predict structural capacity and degradation."},
             {
-              id: "faq-2",
-              title: "How does the platform integrate NDT data?",
-              content: "The system accepts rebound hammer test readings with position coordinates and structural location metadata. Using IS 456:2000 correlations, it estimates current concrete strength and identifies localized degradation zones for targeted retrofit strategies.",
-            },
+              id: "faq-2",              title: "How does the platform integrate NDT data?",              content: "The system accepts rebound hammer test readings with position coordinates and structural location metadata. Using IS 456:2000 correlations, it estimates current concrete strength and identifies localized degradation zones for targeted retrofit strategies."},
             {
-              id: "faq-3",
-              title: "What retrofit strategies are compared?",
-              content: "RetrofitMatrix evaluates GFRP wrapping, CFRP wrapping, FRP laminates, and RC jacketing. Each method is analyzed for strength improvement, cost impact, lifecycle durability, and applicability to your specific structural condition.",
-            },
+              id: "faq-3",              title: "What retrofit strategies are compared?",              content: "RetrofitMatrix evaluates GFRP wrapping, CFRP wrapping, FRP laminates, and RC jacketing. Each method is analyzed for strength improvement, cost impact, lifecycle durability, and applicability to your specific structural condition."},
             {
-              id: "faq-4",
-              title: "Is RetrofitMatrix a replacement for structural engineers?",
-              content: "No. RetrofitMatrix is a decision-support tool designed to augment professional engineering judgment, not replace it. Engineers remain responsible for final design decisions, site verification, and regulatory compliance.",
-            },
+              id: "faq-4",              title: "Is RetrofitMatrix a replacement for structural engineers?",              content: "No. RetrofitMatrix is a decision-support tool designed to augment professional engineering judgment, not replace it. Engineers remain responsible for final design decisions, site verification, and regulatory compliance."},
             {
-              id: "faq-5",
-              title: "What design standards are used?",
-              content: "The platform's calculations are based on Indian Standard IS 456:2000 for concrete design and strength estimation. It also incorporates international best practices for FRP-based retrofitting and failure mode prediction.",
-            },
+              id: "faq-5",              title: "What design standards are used?",              content: "The platform's calculations are based on Indian Standard IS 456:2000 for concrete design and strength estimation. It also incorporates international best practices for FRP-based retrofitting and failure mode prediction."},
             {
-              id: "faq-6",
-              title: "Can I export reports and analysis data?",
-              content: "Yes. Enterprise accounts include comprehensive report generation, data export in multiple formats, and API access for integration into your existing project management systems.",
-            },
+              id: "faq-6",              title: "Can I export reports and analysis data?",              content: "Yes. Enterprise accounts include comprehensive report generation, data export in multiple formats, and API access for integration into your existing project management systems."},
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/technical-illustration-showing-a-concret-1773156671191-5ea39900.jpg?_wi=1"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/technical-illustration-showing-a-concret-1773156671191-5ea39900.jpg"
           imageAlt="Structural retrofit strengthening technique"
           mediaAnimation="slide-up"
           mediaPosition="right"
diff --git a/src/app/pricing/page.tsx b/src/app/pricing/page.tsx
index a4390a3..9ad40ed 100644
--- a/src/app/pricing/page.tsx
+++ b/src/app/pricing/page.tsx
@@ -11,17 +11,16 @@ import { Zap, CheckCircle } from "lucide-react";
 
 export default function PricingPage() {
   const navItems = [
-    { name: "Home", id: "home" },
-    { name: "Platform", id: "optimizer" },
-    { name: "How It Works", id: "methodology" },
-    { name: "Pricing", id: "pricing" },
-    { name: "About", id: "about" },
+    { name: "Home", id: "/" },
+    { name: "Platform", id: "/optimizer" },
+    { name: "How It Works", id: "/methodology" },
+    { name: "Pricing", id: "/pricing" },
+    { name: "About", id: "/about" },
   ];
 
   const footerColumns = [
     {
-      title: "Product",
-      items: [
+      title: "Product",      items: [
         { label: "Platform", href: "/optimizer" },
         { label: "Methodology", href: "/methodology" },
         { label: "Pricing", href: "/pricing" },
@@ -29,8 +28,7 @@ export default function PricingPage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
         { label: "Engineering Blog", href: "#" },
         { label: "Case Studies", href: "#" },
@@ -38,8 +36,7 @@ export default function PricingPage() {
       ],
     },
     {
-      title: "Legal",
-      items: [
+      title: "Legal",      items: [
         { label: "Privacy Policy", href: "#" },
         { label: "Terms of Service", href: "#" },
         { label: "Disclaimer", href: "#" },
@@ -66,9 +63,7 @@ export default function PricingPage() {
           brandName="RetrofitMatrix"
           navItems={navItems}
           button={{
-            text: "Start Analysis",
-            href: "/optimizer",
-          }}
+            text: "Start Analysis",            href: "/optimizer"}}
         />
       </div>
 
@@ -82,16 +77,12 @@ export default function PricingPage() {
           tagAnimation="slide-up"
           buttons={[
             {
-              text: "Request Custom Quote",
-              href: "#contact",
-            },
+              text: "Request Custom Quote",              href: "#contact"},
             {
-              text: "Schedule Demo",
-              href: "#",
-            },
+              text: "Schedule Demo",              href: "#"},
           ]}
           buttonAnimation="slide-up"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-modern-structural-analysis-dashboard-s-1773156668765-b6234675.jpg?_wi=4"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/a-modern-structural-analysis-dashboard-s-1773156668765-b6234675.jpg"
           imageAlt="RetrofitMatrix structural analysis dashboard"
           mediaAnimation="slide-up"
           ariaLabel="Pricing hero section"
@@ -103,59 +94,26 @@ export default function PricingPage() {
         <PricingCardTwo
           plans={[
             {
-              id: "professional",
-              badge: "Professional",
-              badgeIcon: CheckCircle,
-              price: "Contact Sales",
-              subtitle: "For independent structural engineers and small consulting firms",
-              buttons: [
+              id: "professional",              badge: "Professional",              badgeIcon: CheckCircle,
+              price: "Contact Sales",              subtitle: "For independent structural engineers and small consulting firms",              buttons: [
                 {
-                  text: "Request Demo",
-                  href: "#contact",
-                },
+                  text: "Request Demo",                  href: "#contact"},
                 {
-                  text: "Learn More",
-                  onClick: undefined,
-                },
+                  text: "Learn More"},
               ],
               features: [
-                "5 analyses per month",
-                "Basic 3D visualization",
-                "NDT data import",
-                "Email support",
-                "Standard reports",
-                "Single user license",
-                "90-day data retention",
-              ],
+                "5 analyses per month",                "Basic 3D visualization",                "NDT data import",                "Email support",                "Standard reports",                "Single user license",                "90-day data retention"],
             },
             {
-              id: "enterprise",
-              badge: "Enterprise",
-              badgeIcon: CheckCircle,
-              price: "Custom",
-              subtitle: "For EPC companies and large infrastructure consultancies",
-              buttons: [
+              id: "enterprise",              badge: "Enterprise",              badgeIcon: CheckCircle,
+              price: "Custom",              subtitle: "For EPC companies and large infrastructure consultancies",              buttons: [
                 {
-                  text: "Schedule Call",
-                  href: "#contact",
-                },
+                  text: "Schedule Call",                  href: "#contact"},
                 {
-                  text: "Pitch Deck",
-                  onClick: undefined,
-                },
+                  text: "Pitch Deck"},
               ],
               features: [
-                "Unlimited analyses",
-                "Advanced 3D rendering",
-                "Multi-project dashboard",
-                "API integration",
-                "Priority 24/7 support",
-                "Custom reporting",
-                "Team collaboration tools",
-                "Unlimited users",
-                "Unlimited data retention",
-                "On-premise deployment option",
-              ],
+                "Unlimited analyses",                "Advanced 3D rendering",                "Multi-project dashboard",                "API integration",                "Priority 24/7 support",                "Custom reporting",                "Team collaboration tools",                "Unlimited users",                "Unlimited data retention",                "On-premise deployment option"],
             },
           ]}
           animationType="slide-up"
@@ -172,37 +130,19 @@ export default function PricingPage() {
         <FaqSplitMedia
           faqs={[
             {
-              id: "faq-1",
-              title: "What's included in each plan?",
-              content: "Professional plans include 5 monthly analyses with basic 3D visualization and email support. Enterprise plans offer unlimited analyses, advanced features, API access, and priority 24/7 support. All plans include core structural analysis capabilities based on IS 456:2000 standards.",
-            },
+              id: "faq-1",              title: "What's included in each plan?",              content: "Professional plans include 5 monthly analyses with basic 3D visualization and email support. Enterprise plans offer unlimited analyses, advanced features, API access, and priority 24/7 support. All plans include core structural analysis capabilities based on IS 456:2000 standards."},
             {
-              id: "faq-2",
-              title: "Can I upgrade or downgrade my plan?",
-              content: "Yes. You can upgrade or downgrade your plan at any time. Changes take effect at the start of your next billing cycle. Our support team will help ensure a smooth transition between plans.",
-            },
+              id: "faq-2",              title: "Can I upgrade or downgrade my plan?",              content: "Yes. You can upgrade or downgrade your plan at any time. Changes take effect at the start of your next billing cycle. Our support team will help ensure a smooth transition between plans."},
             {
-              id: "faq-3",
-              title: "Do you offer volume discounts?",
-              content: "Yes. For organizations planning multiple seats or custom deployments, we offer volume discounts and custom pricing models. Contact our sales team at sales@retrofitmatrix.com to discuss your requirements.",
-            },
+              id: "faq-3",              title: "Do you offer volume discounts?",              content: "Yes. For organizations planning multiple seats or custom deployments, we offer volume discounts and custom pricing models. Contact our sales team at sales@retrofitmatrix.com to discuss your requirements."},
             {
-              id: "faq-4",
-              title: "What is your payment and contract terms?",
-              content: "Professional plans are billed monthly. Enterprise plans are typically annual with custom payment terms. All plans are subject to our standard terms of service. Multi-year commitments qualify for additional discounts.",
-            },
+              id: "faq-4",              title: "What is your payment and contract terms?",              content: "Professional plans are billed monthly. Enterprise plans are typically annual with custom payment terms. All plans are subject to our standard terms of service. Multi-year commitments qualify for additional discounts."},
             {
-              id: "faq-5",
-              title: "Is there a free trial available?",
-              content: "Yes. We offer a 14-day free trial of the Professional plan with full access to platform features. No credit card required to start. Enterprise customers receive a dedicated technical walkthrough.",
-            },
+              id: "faq-5",              title: "Is there a free trial available?",              content: "Yes. We offer a 14-day free trial of the Professional plan with full access to platform features. No credit card required to start. Enterprise customers receive a dedicated technical walkthrough."},
             {
-              id: "faq-6",
-              title: "What support is included?",
-              content: "Professional plans include email support (24-48 hour response). Enterprise plans include priority 24/7 phone and email support, dedicated account management, and quarterly business reviews.",
-            },
+              id: "faq-6",              title: "What support is included?",              content: "Professional plans include email support (24-48 hour response). Enterprise plans include priority 24/7 phone and email support, dedicated account management, and quarterly business reviews."},
           ]}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/technical-illustration-showing-a-concret-1773156671191-5ea39900.jpg?_wi=2"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Al9uBCdwZTbaTO3HYdkY10yESE/technical-illustration-showing-a-concret-1773156671191-5ea39900.jpg"
           imageAlt="Structural retrofit strengthening technique"
           mediaAnimation="slide-up"
           mediaPosition="right"