diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index 30ce381..ace8bbd 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -24,18 +24,18 @@ export default function BlogPage() {
             headingFontWeight="light"
         >
             <ReactLenis root>
-                <NavbarStyleFullscreen
-                    navItems={[
-                        { name: "Home", id: "/" },
-                        { name: "Services", id: "services" },
-                        { name: "About", id: "about" },
-                        { name: "Clients", id: "clients" },
-                        { name: "Contact", id: "contact" },
-                    ]}
-                    brandName="DigitalEdge"
-                    bottomLeftText="Innovation in Digital"
-                    bottomRightText="info@digitaledge.com"
-                />
+                <div id="nav" data-section="nav">
+                  <NavbarStyleFullscreen
+                      navItems={[
+                          { name: "Home", id: "/" },
+                          { name: "Blog", id: "/blog" },
+                          { name: "Shop", id: "/shop" },
+                      ]}
+                      brandName="DigitalEdge"
+                      bottomLeftText="Innovation in Digital"
+                      bottomRightText="info@digitaledge.com"
+                  />
+                </div>
 
                 {isLoading ? (
                     <div className="w-content-width mx-auto py-20 text-center">
@@ -52,25 +52,27 @@ export default function BlogPage() {
                     />
                 )}
 
-                <FooterLogoEmphasis
-                    columns={[
-                        {
-                            items: [
-                                { label: "Home", href: "home" },
-                                { label: "Services", href: "services" },
-                                { label: "About Us", href: "about" },
-                            ],
-                        },
-                        {
-                            items: [
-                                { label: "Clients", href: "clients" },
-                                { label: "Testimonials", href: "testimonials" },
-                                { label: "Contact", href: "contact" },
-                            ],
-                        },
-                    ]}
-                    logoText="DigitalEdge"
-                />
+                <div id="footer" data-section="footer">
+                  <FooterLogoEmphasis
+                      columns={[
+                          {
+                              items: [
+                                  { label: "Home", href: "/" },
+                                  { label: "Services", href: "/#features" },
+                                  { label: "About Us", href: "/#about" },
+                              ],
+                          },
+                          {
+                              items: [
+                                  { label: "Clients", href: "/#social-proof" },
+                                  { label: "Testimonials", href: "/#testimonials" },
+                                  { label: "Contact", href: "/#contact" },
+                              ],
+                          },
+                      ]}
+                      logoText="DigitalEdge"
+                  />
+                </div>
             </ReactLenis>
         </ThemeProvider>
     );
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 2968c74..ff1c6d1 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -27,7 +27,7 @@ export default function LandingPage() {
     >
       <div id="nav" data-section="nav">
         <NavbarStyleFullscreen 
-          navItems={[{name:"Home",id:"home"},{name:"Services",id:"services"},{name:"About",id:"about"},{name:"Clients",id:"clients"},{name:"Contact",id:"contact"}]}
+          navItems={[{name:"Home",id:"/"},{name:"Blog",id:"/blog"},{name:"Shop",id:"/shop"}]}
           brandName="DigitalEdge"
           bottomLeftText="Innovation in Digital"
           bottomRightText="info@digitaledge.com"
@@ -37,7 +37,7 @@ export default function LandingPage() {
         <HeroLogo 
           logoText="DigitalEdge"
           description="Empowering your brand's digital presence with innovative strategies and measurable results."
-          buttons={[{text:"Our Services",href:"services"},{text:"Get a Quote",href:"contact"}]}
+          buttons={[{text:"Our Services",href:"features"},{text:"Get a Quote",href:"contact"}]}
           imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_339dVf94DAODTfYQfi9pwJxtvKj/abstract-digital-marketing-background-wi-1771795017022-4fd2f272.png"
           imageAlt="Abstract digital marketing background"
           showDimOverlay={true}
@@ -52,6 +52,7 @@ export default function LandingPage() {
             {icon: TrendingUp, label: "Average ROI", value: "300%"},
             {icon: Globe, label: "Campaigns Launched", value: "1000+"}
           ]}
+          metricsAnimation="slide-up"
           useInvertedBackground={false}
           className="py-16 md:py-24"
         />
@@ -69,6 +70,7 @@ export default function LandingPage() {
           ]}
           imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_339dVf94DAODTfYQfi9pwJxtvKj/abstract-representation-of-seo-optimizat-1771795017647-012ac8e0.png"
           imageAlt="Abstract illustration of SEO optimization"
+          mediaAnimation='slide-up'
           useInvertedBackground={false}
           mediaPosition="right"
         />
@@ -78,10 +80,12 @@ export default function LandingPage() {
           title="Trusted By Industry Leaders"
           description="Our expertise has empowered renowned brands to achieve their digital marketing goals."
           tag="Partners"
+          names={["Microsoft", "Google", "Adobe", "Shopify", "HubSpot", "Salesforce", "Mailchimp"]}
           logos={[
             "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_339dVf94DAODTfYQfi9pwJxtvKj/stylized-microsoft-logo-modern-and-sleek-1771795017708-1e57c145.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_339dVf94DAODTfYQfi9pwJxtvKj/stylized-google-logo-modern-and-sleek-in-1771795017449-0bc9f408.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_339dVf94DAODTfYQfi9pwJxtvKj/stylized-adobe-logo-modern-and-sleek-in--1771795017263-d4b2553a.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_339dVf94DAODTfYQfi9pwJxtvKj/stylized-shopify-logo-modern-and-sleek-i-1771795017251-663a2beb.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_339dVf94DAODTfYQfi9pwJxtvKj/stylized-hubspot-logo-modern-and-sleek-i-1771795017857-d94ea3e9.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_339dVf94DAODTfYQfi9pwJxtvKj/stylized-salesforce-logo-modern-and-slee-1771795027411-233cea21.png",            "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_339dVf94DAODTfYQfi9pwJxtvKj/stylized-mailchimp-logo-modern-and-sleek-1771795017179-dc519fe0.png"
           ]}
           speed={40}
+          textboxLayout='default'
           showCard={true}
           useInvertedBackground={false}
         />
@@ -115,8 +119,8 @@ export default function LandingPage() {
       <div id="footer" data-section="footer">
         <FooterLogoEmphasis 
           columns={[
-            {items: [{label: "Home", href: "home"}, {label: "Services", href: "services"}, {label: "About Us", href: "about"}]},
-            {items: [{label: "Clients", href: "clients"}, {label: "Testimonials", href: "testimonials"}, {label: "Contact", href: "contact"}]}
+            {items: [{label: "Home", href: "hero"}, {label: "Services", href: "features"}, {label: "About Us", href: "about"}]},
+            {items: [{label: "Clients", href: "social-proof"}, {label: "Testimonials", href: "testimonials"}, {label: "Contact", href: "contact"}]}
           ]}
           logoText="DigitalEdge"
         />
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index c57a87e..4b05e87 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -74,93 +74,9 @@ function ProductPageContent({ params }: ProductPageProps) {
         await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
     }, [cartItems, checkout, getCheckoutItems]);
 
-    if (isLoading) {
-        return (
-            <ThemeProvider
-                defaultButtonVariant="shift-hover"
-                defaultTextAnimation="entrance-slide"
-                borderRadius="pill"
-                contentWidth="mediumSmall"
-                sizing="mediumLargeSizeLargeTitles"
-                background="floatingGradient"
-                cardStyle="glass-elevated"
-                primaryButtonStyle="gradient"
-                secondaryButtonStyle="solid"
-                headingFontWeight="light"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarStyleFullscreen
-                            navItems={[{ name: "Home", id: "/" }, { name: "Services", id: "services" }, { name: "About", id: "about" }, { name: "Clients", id: "clients" }, { name: "Contact", id: "contact" }, { name: "Shop", id: "/shop" }]}
-                            brandName="DigitalEdge"
-                            bottomLeftText="Innovation in Digital"
-                            bottomRightText="info@digitaledge.com"
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        />
-                    </div>
-                    <div id="loading-section" data-section="loading-section">
-                        <main className="min-h-screen flex items-center justify-center pt-20">
-                            <p className="text-foreground">Loading product...</p>
-                        </main>
-                    </div>
-                    <div id="footer" data-section="footer">
-                        <FooterLogoEmphasis
-                            columns={[{ items: [{ label: "Home", href: "home" }, { label: "Services", href: "services" }, { label: "About Us", href: "about" }] }, { items: [{ label: "Clients", href: "clients" }, { label: "Testimonials", href: "testimonials" }, { label: "Contact", href: "contact" }] }]}
-                            logoText="DigitalEdge"
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
-    }
 
-    if (!product) {
-        return (
-            <ThemeProvider
-                defaultButtonVariant="shift-hover"
-                defaultTextAnimation="entrance-slide"
-                borderRadius="pill"
-                contentWidth="mediumSmall"
-                sizing="mediumLargeSizeLargeTitles"
-                background="floatingGradient"
-                cardStyle="glass-elevated"
-                primaryButtonStyle="gradient"
-                secondaryButtonStyle="solid"
-                headingFontWeight="light"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarStyleFullscreen
-                            navItems={[{ name: "Home", id: "/" }, { name: "Services", id: "services" }, { name: "About", id: "about" }, { name: "Clients", id: "clients" }, { name: "Contact", id: "contact" }, { name: "Shop", id: "/shop" }]}
-                            brandName="DigitalEdge"
-                            bottomLeftText="Innovation in Digital"
-                            bottomRightText="info@digitaledge.com"
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        />
-                    </div>
-                    <div id="not-found-section" data-section="not-found-section">
-                        <main className="min-h-screen flex items-center justify-center pt-20">
-                            <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 text-primary-cta-text"
-                                >
-                                    Back to Shop
-                                </button>
-                            </div>
-                        </main>
-                    </div>
-                    <div id="footer" data-section="footer">
-                        <FooterLogoEmphasis
-                            columns={[{ items: [{ label: "Home", href: "home" }, { label: "Services", href: "services" }, { label: "About Us", href: "about" }] }, { items: [{ label: "Clients", href: "clients" }, { label: "Testimonials", href: "testimonials" }, { label: "Contact", href: "contact" }] }]}
-                            logoText="DigitalEdge"
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
-    }
+    const navItems = [{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }];
+    const footerColumns = [{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/#features" }, { label: "About Us", href: "/#about" }] }, { items: [{ label: "Clients", href: "/#social-proof" }, { label: "Testimonials", href: "/#testimonials" }, { label: "Contact", href: "/#contact" }] }];
 
     return (
         <ThemeProvider
@@ -176,16 +92,42 @@ function ProductPageContent({ params }: ProductPageProps) {
             headingFontWeight="light"
         >
             <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                     <NavbarStyleFullscreen
-                        navItems={[{ name: "Home", id: "/" }, { name: "Services", id: "services" }, { name: "About", id: "about" }, { name: "Clients", id: "clients" }, { name: "Contact", id: "contact" }, { name: "Shop", id: "/shop" }]}
+                        navItems={navItems}
                         brandName="DigitalEdge"
                         bottomLeftText="Innovation in Digital"
                         bottomRightText="info@digitaledge.com"
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
                 </div>
-                <div id="product-detail-card" data-section="product-detail-card">
+
+                {isLoading && (
+                  <div id="loading-section" data-section="loading-section">
+                      <main className="min-h-screen flex items-center justify-center pt-20">
+                          <p className="text-foreground">Loading product...</p>
+                      </main>
+                  </div>
+                )}
+
+                {!isLoading && !product && (
+                  <div id="not-found-section" data-section="not-found-section">
+                      <main className="min-h-screen flex items-center justify-center pt-20">
+                          <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 text-primary-cta-text"
+                              >
+                                  Back to Shop
+                              </button>
+                          </div>
+                      </main>
+                  </div>
+                )}
+
+                {!isLoading && product && (
+                  <div id="product-detail-card" data-section="product-detail-card">
                     <ProductDetailCard
                         layout="page"
                         name={product.name}
@@ -205,7 +147,9 @@ function ProductPageContent({ params }: ProductPageProps) {
                             { text: "Buy Now", onClick: handleBuyNow },
                         ]}
                     />
-                </div>
+                  </div>
+                )}
+
                 <div id="product-cart" data-section="product-cart">
                     <ProductCart
                         isOpen={cartOpen}
@@ -221,9 +165,10 @@ function ProductPageContent({ params }: ProductPageProps) {
                         ]}
                     />
                 </div>
+
                 <div id="footer" data-section="footer">
                     <FooterLogoEmphasis
-                        columns={[{ items: [{ label: "Home", href: "home" }, { label: "Services", href: "services" }, { label: "About Us", href: "about" }] }, { items: [{ label: "Clients", href: "clients" }, { label: "Testimonials", href: "testimonials" }, { label: "Contact", href: "contact" }] }]}
+                        columns={footerColumns}
                         logoText="DigitalEdge"
                     />
                 </div>
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 230f57a..9ee305a 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -17,45 +17,6 @@ function ShopPageContent() {
         filters,
     } = useProductCatalog({ basePath: "/shop" });
 
-    if (isLoading) {
-        return (
-            <ThemeProvider
-                defaultButtonVariant="shift-hover"
-                defaultTextAnimation="entrance-slide"
-                borderRadius="pill"
-                contentWidth="mediumSmall"
-                sizing="mediumLargeSizeLargeTitles"
-                background="floatingGradient"
-                cardStyle="glass-elevated"
-                primaryButtonStyle="gradient"
-                secondaryButtonStyle="solid"
-                headingFontWeight="light"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarStyleFullscreen
-                            navItems={[{ name: "Home", id: "/" }, { name: "Services", id: "services" }, { name: "About", id: "about" }, { name: "Clients", id: "clients" }, { name: "Contact", id: "contact" }, { name: "Shop", id: "/shop" }]}
-                            brandName="DigitalEdge"
-                            bottomLeftText="Innovation in Digital"
-                            bottomRightText="info@digitaledge.com"
-                        />
-                    </div>
-                    <div id="loading-section" data-section="loading-section">
-                        <main className="min-h-screen flex items-center justify-center pt-20">
-                            <p className="text-foreground">Loading products...</p>
-                        </main>
-                    </div>
-                    <div id="footer" data-section="footer">
-                        <FooterLogoEmphasis
-                            columns={[{ items: [{ label: "Home", href: "home" }, { label: "Services", href: "services" }, { label: "About Us", href: "about" }] }, { items: [{ label: "Clients", href: "clients" }, { label: "Testimonials", href: "testimonials" }, { label: "Contact", href: "contact" }] }]}
-                            logoText="DigitalEdge"
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
-    }
-
     return (
         <ThemeProvider
             defaultButtonVariant="shift-hover"
@@ -70,28 +31,38 @@ function ShopPageContent() {
             headingFontWeight="light"
         >
             <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                     <NavbarStyleFullscreen
-                        navItems={[{ name: "Home", id: "/" }, { name: "Services", id: "services" }, { name: "About", id: "about" }, { name: "Clients", id: "clients" }, { name: "Contact", id: "contact" }, { name: "Shop", id: "/shop" }]}
+                        navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
                         brandName="DigitalEdge"
                         bottomLeftText="Innovation in Digital"
                         bottomRightText="info@digitaledge.com"
                     />
                 </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>
+                
+                {isLoading ? (
+                    <div id="loading-section" data-section="loading-section">
+                        <main className="min-h-screen flex items-center justify-center pt-20">
+                            <p className="text-foreground">Loading products...</p>
+                        </main>
+                    </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>
+                )}
+                
                 <div id="footer" data-section="footer">
                     <FooterLogoEmphasis
-                        columns={[{ items: [{ label: "Home", href: "home" }, { label: "Services", href: "services" }, { label: "About Us", href: "about" }] }, { items: [{ label: "Clients", href: "clients" }, { label: "Testimonials", href: "testimonials" }, { label: "Contact", href: "contact" }] }]}
+                        columns={[{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/#features" }, { label: "About Us", href: "/#about" }] }, { items: [{ label: "Clients", href: "/#social-proof" }, { label: "Testimonials", href: "/#testimonials" }, { label: "Contact", href: "/#contact" }] }]}
                         logoText="DigitalEdge"
                     />
                 </div>