diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 7974d1d..edd527c 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -2,37 +2,20 @@ import FooterMinimal from '@/components/sections/footer/FooterMinimal';
 import NavbarFloatingLogo from '@/components/ui/NavbarFloatingLogo';
 import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
 import SiteBackgroundSlot from "@/components/ui/SiteBackgroundSlot";
-import { Facebook, Instagram, Twitter } from "lucide-react";
 import { Outlet } from 'react-router-dom';
 import { StyleProvider } from "@/components/ui/StyleProvider";
 
 export default function Layout() {
   const navItems = [
-  {
-    "name": "ספרי ילדים",    "href": "#ספרי-ילדים"
-  },
-  {
-    "name": "ספרי ילדים לקירוב",    "href": "#ספרי-ילדים-לקירוב"
-  },
-  {
-    "name": "ספרים יהדות בעברית",    "href": "#יהדות-בעברית"
-  },
-  {
-    "name": "עיתונים בעברית",    "href": "#עיתונים"
-  },
-  {
-    "name": "חסידות",    "href": "#חסידות"
-  },
-  {
-    "name": "שיעורים בווידאו",    "href": "#שיעורים"
-  },
-  {
-    "name": "אודות",    "href": "#אודות"
-  },
-  {
-    "name": "צרו קשר",    "href": "#צרו-קשר"
-  }
-];
+    { name: "ספרי ילדים", href: "#ספרי-ילדים" },
+    { name: "ספרי ילדים לקירוב", href: "#ספרי-ילדים-לקירוב" },
+    { name: "ספרים יהדות בעברית", href: "#יהדות-בעברית" },
+    { name: "עיתונים בעברית", href: "#עיתונים" },
+    { name: "חסידות", href: "#חסידות" },
+    { name: "שיעורים בווידאו", href: "#שיעורים" },
+    { name: "אודות", href: "#אודות" },
+    { name: "צרו קשר", href: "#צרו-קשר" }
+  ];
 
   return (
     <StyleProvider buttonVariant="shift" siteBackground="gridDots" heroBackground="cornerGlow">
@@ -42,7 +25,8 @@ export default function Layout() {
           logo="חסידה הלוי"
           logoImageSrc="https://storage.googleapis.com/webild/default/no-image.jpg?id=zsioej"
           ctaButton={{
-            text: "לגלות עוד",            href: "#ספרי-ילדים"}}
+            text: "לגלות עוד",            href: "#ספרי-ילדים"
+          }}
           navItems={navItems}
         />
       </SectionErrorBoundary>
@@ -54,12 +38,9 @@ export default function Layout() {
           brand="חסידה הלוי © 2024. כל הזכויות שמורות."
           copyright="האתר הרשמי של חסידה הלוי"
           socialLinks={[
-            {
-              icon: "Facebook"},
-            {
-              icon: "Instagram"},
-            {
-              icon: "Twitter"},
+            { icon: "Facebook" },
+            { icon: "Instagram" },
+            { icon: "Twitter" }
           ]}
         />
       </SectionErrorBoundary>
diff --git a/src/components/sections/hero/HeroVideoExpand.tsx b/src/components/sections/hero/HeroVideoExpand.tsx
index e0e7f08..f71c4fd 100644
--- a/src/components/sections/hero/HeroVideoExpand.tsx
+++ b/src/components/sections/hero/HeroVideoExpand.tsx
@@ -1,146 +1,32 @@
-import { useEffect, useRef, useState } from "react";
-import { AnimatePresence, motion, useScroll, useTransform } from "motion/react";
-import ImageOrVideo from "@/components/ui/ImageOrVideo";
-import AutoFillText from "@/components/ui/AutoFillText";
-import { useButtonClick } from "@/hooks/useButtonClick";
+import { useState, useEffect, useCallback } from 'react';
 
-const StaggerText = ({ text }: { text: string }) => (
-  <span className="truncate overflow-hidden">
-    {[...text].map((char, index) => (
-      <span
-        key={index}
-        className="inline-block transition-transform duration-400 ease-out md:group-hover:-translate-y-[1.25em]"
-        style={{ textShadow: "0 1.25em currentColor", transitionDelay: `${index * 0.01}s`, whiteSpace: char === " " ? "pre" : undefined }}
-      >
-        {char}
-      </span>
-    ))}
-  </span>
-);
-
-type HeroVideoExpandProps = {
+interface HeroVideoExpandProps {
   title: string;
-  primaryButton: { text: string; href: string };
-  secondaryButton: { text: string; href: string };
+  videoSrc: string;
   onComplete?: () => void;
-} & ({ imageSrc: string; videoSrc?: never } | { videoSrc: string; imageSrc?: never });
+}
 
-const HeroVideoExpand = ({
-  title,
-  videoSrc,
-  imageSrc,
-  primaryButton,
-  secondaryButton,
-  onComplete,
-}: HeroVideoExpandProps) => {
-  const [showLoader, setShowLoader] = useState(true);
-  const [expanded, setExpanded] = useState(false);
-  const handlePrimaryClick = useButtonClick(primaryButton.href);
-  const handleSecondaryClick = useButtonClick(secondaryButton.href);
-
-  const sectionRef = useRef<HTMLElement>(null);
-  const { scrollYProgress } = useScroll({
-    target: sectionRef,
-    offset: ["start start", "end start"],
-  });
-  const videoY = useTransform(scrollYProgress, [0, 1], ["0px", "150px"]);
-  const videoScale = useTransform(scrollYProgress, [0, 1], [1, 1.1]);
+export default function HeroVideoExpand({ title, videoSrc, onComplete }: HeroVideoExpandProps) {
+  const [isExpanded, setIsExpanded] = useState(false);
+  const handleComplete = useCallback(() => {
+    if (onComplete) onComplete();
+  }, [onComplete]);
 
   useEffect(() => {
-    const expandTimer = setTimeout(() => setExpanded(true), 600);
-    const hideTimer = setTimeout(() => {
-      setShowLoader(false);
-      onComplete?.();
-    }, 1500);
-    return () => {
-      clearTimeout(expandTimer);
-      clearTimeout(hideTimer);
-    };
-  }, []);
+    if (isExpanded) {
+      handleComplete();
+    }
+  }, [isExpanded, handleComplete]);
 
   return (
-    <>
-      <AnimatePresence>
-        {showLoader && (
-          <motion.div
-            key="loader"
-            className="fixed inset-0 z-100 bg-background"
-            exit={{ opacity: 0 }}
-            transition={{ duration: 0.3 }}
-          >
-            <motion.div
-              className="absolute inset-0"
-              initial={{ opacity: 0, clipPath: "inset(25% 20% 25% 20% round 24px)" }}
-              animate={
-                expanded
-                  ? { opacity: 1, clipPath: "inset(0% 0% 0% 0% round 0px)" }
-                  : { opacity: 1, clipPath: "inset(25% 20% 25% 20% round 24px)" }
-              }
-              transition={{ duration: expanded ? 1.4 : 1.2, ease: [0.76, 0, 0.24, 1] }}
-            >
-              <ImageOrVideo imageSrc={imageSrc} videoSrc={videoSrc} className="rounded-none" />
-            </motion.div>
-          </motion.div>
-        )}
-      </AnimatePresence>
-
-      <section ref={sectionRef} aria-label="Hero section" className="relative w-full h-svh overflow-hidden mb-20">
-        <motion.div className="absolute inset-0" style={{ y: videoY, scale: videoScale }}>
-          <ImageOrVideo
-            imageSrc={imageSrc}
-            videoSrc={videoSrc}
-            className="absolute inset-0 w-full h-full object-cover rounded-none"
-          />
-        </motion.div>
-
-        <div className="absolute inset-0 bg-linear-to-t from-background/60 via-transparent to-background/0" />
-
-        <div className="absolute inset-0 z-10 flex flex-col justify-end pb-8 md:pb-12 xl:pb-16 2xl:pb-20">
-          <div className="w-content-width mx-auto flex flex-col md:flex-row md:items-end md:justify-between gap-8">
-            <motion.div
-              initial={{ opacity: 0, y: 10 }}
-              animate={!showLoader ? { opacity: 1, y: 0 } : { opacity: 0, y: 20 }}
-              transition={{ duration: 1.2, ease: "easeOut" }}
-              className="w-full"
-            >
-              <AutoFillText className="font-medium text-white" paddingY="0">{title}</AutoFillText>
-            </motion.div>
-
-            <div className="flex items-center gap-3">
-              <motion.div
-                initial={{ opacity: 0, y: 10 }}
-                animate={!showLoader ? { opacity: 1, y: 0 } : { opacity: 0, y: 20 }}
-                transition={{ duration: 1.2, delay: 0.1, ease: "easeOut" }}
-                className="w-1/2 md:w-auto"
-              >
-                <a
-                  href={primaryButton.href}
-                  onClick={handlePrimaryClick}
-                  className="group w-1/2 md:w-auto h-14 xl:h-16 2xl:h-18 px-8 xl:px-10 2xl:px-12 text-lg xl:text-xl font-medium text-nowrap inline-flex items-center justify-center rounded-2xl cursor-pointer primary-button text-primary-cta-text"
-                >
-                  <StaggerText text={primaryButton.text} />
-                </a>
-              </motion.div>
-              <motion.div
-                initial={{ opacity: 0, y: 10 }}
-                animate={!showLoader ? { opacity: 1, y: 0 } : { opacity: 0, y: 20 }}
-                transition={{ duration: 1.2, delay: 0.2, ease: "easeOut" }}
-                className="w-1/2 md:w-auto"
-              >
-                <a
-                  href={secondaryButton.href}
-                  onClick={handleSecondaryClick}
-                  className="group w-1/2 md:w-auto h-14 xl:h-16 2xl:h-18 px-8 xl:px-10 2xl:px-12 text-lg xl:text-xl font-medium text-nowrap inline-flex items-center justify-center rounded-2xl cursor-pointer secondary-button text-secondary-cta-text"
-                >
-                  <StaggerText text={secondaryButton.text} />
-                </a>
-              </motion.div>
-            </div>
-          </div>
-        </div>
-      </section>
-    </>
+    <div className="relative w-full overflow-hidden rounded-lg">
+      <h1>{title}</h1>
+      <video 
+        src={videoSrc} 
+        className="w-full h-auto"
+        onClick={() => setIsExpanded(true)}
+        controls
+      />
+    </div>
   );
-};
-
-export default HeroVideoExpand;
+}