diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index 9b93317..9ebc5c6 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -1,10 +1,9 @@
 "use client";
 
-import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import { useBlogPosts } from "@/hooks/useBlogPosts";
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
-import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
+import FeatureCardTwentyFour from '@/components/sections/feature/FeatureCardTwentyFour';
 
 export default function BlogPage() {
     const { posts, isLoading } = useBlogPosts();
@@ -22,38 +21,42 @@ export default function BlogPage() {
             secondaryButtonStyle="layered"
             headingFontWeight="light"
         >
-            <ReactLenis root>
-                <div id="nav" data-section="nav">
-                    <NavbarStyleCentered
-                        navItems={[
-                            { name: "Home", id: "/" },
-                            { name: "Blog", id: "/blog" },
-                            { name: "Shop", id: "/shop" },
-                        ]}
-                        button={{ text: "Shop Now", href: "/shop" }}
-                        brandName="Dring Together"
+            <div id="nav" data-section="nav">
+                <NavbarStyleCentered
+                    navItems={[
+                        { name: "Home", id: "/" },
+                        { name: "Blog", id: "/blog" },
+                        { name: "Shop", id: "/shop" },
+                    ]}
+                    button={{ text: "Shop Now", href: "/shop" }}
+                    brandName="Dring Together"
+                />
+            </div>
+
+            {isLoading ? (
+                <div className="w-content-width mx-auto py-20 text-center">
+                    <p className="text-foreground">Loading posts...</p>
+                </div>
+            ) : (
+                <div id="blog" data-section="blog">
+                    <FeatureCardTwentyFour
+                        features={posts.map(post => ({
+                            id: post.id,
+                            title: post.title,
+                            author: post.author || 'Dring Together',
+                            description: post.excerpt,
+                            tags: post.tags || [],
+                            imageSrc: post.image,
+                            imageAlt: post.title,
+                        }))}
+                        title="Latest Articles"
+                        description="Insights and updates from our team"
+                        animationType="slide-up"
+                        textboxLayout="default"
+                        useInvertedBackground={false}
                     />
                 </div>
-
-                    {isLoading ? (
-                        <div className="w-content-width mx-auto py-20 text-center">
-                            <p className="text-foreground">Loading posts...</p>
-                        </div>
-                    ) : (
-                        <div id="blog" data-section="blog">
-                            <BlogCardTwo
-                                posts={posts}
-                                title="Latest Articles"
-                                description="Insights and updates from our team"
-                                animationType="slide-up"
-                                textboxLayout="default"
-                                useInvertedBackground={false}
-                                carouselMode="buttons"
-                            />
-                        </div>
-                    )}
-
-            </ReactLenis>
+            )}
         </ThemeProvider>
     );
 }
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 59dbd21..28ce40b 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -68,9 +68,9 @@ export default function SitePage() {
           buttonAnimation="slide-up"
           dashboard={{
             title: "Featured Collection",            stats: [
-              { title: "Sustainable Materials", values: [95, 98, 100], valueSuffix: "%", description: "Sustainably sourced materials." },
-              { title: "Customer Satisfaction", values: [94, 96, 98], valueSuffix: "%", description: "Based on 500+ reviews." },
-              { title: "Global Shipping", values: [180, 190, 200], valueSuffix: "+ Countries", description: "Available worldwide." },
+              { title: "Sustainable Materials", values: [100], valueSuffix: "%", description: "Sustainably sourced materials." },
+              { title: "Customer Satisfaction", values: [98], valueSuffix: "%", description: "Based on 500+ reviews." },
+              { title: "Global Shipping", values: [200], valueSuffix: "+ Countries", description: "Available worldwide." },
             ],
             logoIcon: Coffee,
             sidebarItems: [
@@ -99,8 +99,6 @@ export default function SitePage() {
           descriptionClassName="text-lg text-gray-600 max-w-2xl mb-8"
           tagClassName="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium bg-purple-100 text-purple-800 mb-6"
           buttonContainerClassName="flex flex-col sm:flex-row gap-4"
-          buttonClassName="px-6 py-3 rounded-lg font-medium transition-all duration-300 hover:shadow-lg"
-          buttonTextClassName="flex items-center gap-2"
           dashboardClassName="mt-12"
         />
       </div>
@@ -257,7 +255,6 @@ export default function SitePage() {
           titleClassName="text-3xl font-bold text-gray-900 mb-4"
           descriptionClassName="text-lg text-gray-600 mb-8"
           buttonClassName="bg-purple-600 hover:bg-purple-700 text-white font-semibold py-3 px-6 rounded-lg transition duration-300 ease-in-out transform hover:-translate-y-0.5"
-          buttonTextClassName="flex items-center justify-center"
           mediaWrapperClassName="relative rounded-2xl overflow-hidden shadow-xl"
           mediaClassName="w-full h-full object-cover"
         />
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index 618912e..00cdfc6 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -2,7 +2,6 @@
 
 import { Suspense, use, useCallback } from "react";
 import { useRouter } from "next/navigation";
-import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
@@ -101,14 +100,12 @@ function ProductPageContent({ params }: ProductPageProps) {
                 secondaryButtonStyle="layered"
                 headingFontWeight="light"
             >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        {navbar}
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <p className="text-foreground">Loading product...</p>
-                    </main>
-                </ReactLenis>
+                <div id="nav" data-section="nav">
+                    {navbar}
+                </div>
+                <main className="min-h-screen flex items-center justify-center pt-20">
+                    <p className="text-foreground">Loading product...</p>
+                </main>
             </ThemeProvider>
         );
     }
@@ -127,22 +124,20 @@ function ProductPageContent({ params }: ProductPageProps) {
                 secondaryButtonStyle="layered"
                 headingFontWeight="light"
             >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        {navbar}
+                <div id="nav" data-section="nav">
+                    {navbar}
+                </div>
+                <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 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>
-                </ReactLenis>
+                </main>
             </ThemeProvider>
         );
     }
@@ -160,47 +155,45 @@ function ProductPageContent({ params }: ProductPageProps) {
             secondaryButtonStyle="layered"
             headingFontWeight="light"
         >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
-                    {navbar}
-                </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,
-                        },
-                    ]}
-                />
-                </div>
-            </ReactLenis>
+            <div id="nav" data-section="nav">
+                {navbar}
+            </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,
+                    },
+                ]}
+            />
+            </div>
         </ThemeProvider>
     );
 }
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 1114d1c..e2af18a 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { Suspense, useCallback } from "react";
-import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
@@ -68,14 +67,12 @@ function ShopPageContent() {
                 secondaryButtonStyle="layered"
                 headingFontWeight="light"
             >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        {navbar}
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <p className="text-foreground">Loading products...</p>
-                    </main>
-                </ReactLenis>
+                <div id="nav" data-section="nav">
+                    {navbar}
+                </div>
+                <main className="min-h-screen flex items-center justify-center pt-20">
+                    <p className="text-foreground">Loading products...</p>
+                </main>
             </ThemeProvider>
         );
     }
@@ -93,37 +90,35 @@ function ShopPageContent() {
             secondaryButtonStyle="layered"
             headingFontWeight="light"
         >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
-                    {navbar}
-                </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="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,
-                            },
-                        ]}
-                    />
-                </div>
-            </ReactLenis>
+            <div id="nav" data-section="nav">
+                {navbar}
+            </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="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,
+                        },
+                    ]}
+                />
+            </div>
         </ThemeProvider>
     );
 }