diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index 85c187d..191bc49 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -72,4 +72,4 @@ export default function BlogPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
\ No newline at end of file
+}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 7e2d666..3b5a7df 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -431,6 +431,20 @@ export default function RootLayout({
     
     originalContent = element.textContent;
     element.contentEditable = 'true';
+    
+    if (!element.dataset.webildOriginalWhiteSpace) {
+      const computedStyle = window.getComputedStyle(element);
+      element.dataset.webildOriginalWhiteSpace = computedStyle.whiteSpace;
+      element.dataset.webildOriginalWordWrap = computedStyle.wordWrap;
+      element.dataset.webildOriginalOverflowWrap = computedStyle.overflowWrap;
+      element.dataset.webildOriginalOverflow = computedStyle.overflow;
+    }
+    
+    element.style.whiteSpace = 'pre-wrap';
+    element.style.wordWrap = 'break-word';
+    element.style.overflowWrap = 'break-word';
+    element.style.overflow = 'visible';
+    
     element.focus();
     isEditing = true;
     
@@ -540,6 +554,23 @@ export default function RootLayout({
     element.contentEditable = 'false';
     isEditing = false;
     
+    if (element.dataset.webildOriginalWhiteSpace) {
+      element.style.whiteSpace = element.dataset.webildOriginalWhiteSpace === 'normal' ? '' : element.dataset.webildOriginalWhiteSpace;
+      delete element.dataset.webildOriginalWhiteSpace;
+    }
+    if (element.dataset.webildOriginalWordWrap) {
+      element.style.wordWrap = element.dataset.webildOriginalWordWrap === 'normal' ? '' : element.dataset.webildOriginalWordWrap;
+      delete element.dataset.webildOriginalWordWrap;
+    }
+    if (element.dataset.webildOriginalOverflowWrap) {
+      element.style.overflowWrap = element.dataset.webildOriginalOverflowWrap === 'normal' ? '' : element.dataset.webildOriginalOverflowWrap;
+      delete element.dataset.webildOriginalOverflowWrap;
+    }
+    if (element.dataset.webildOriginalOverflow) {
+      element.style.overflow = element.dataset.webildOriginalOverflow === 'visible' ? '' : element.dataset.webildOriginalOverflow;
+      delete element.dataset.webildOriginalOverflow;
+    }
+    
     if (element.dataset.beforeInputHandler === 'true') {
       element.removeEventListener('beforeinput', () => {});
       delete element.dataset.beforeInputHandler;
@@ -845,6 +876,9 @@ export default function RootLayout({
 
   const handleScroll = () => {
     if (!isActive) return;
+    
+    if (isEditing) return;
+    
     if (selectedElement) {
       makeUneditable(selectedElement, false);
       selectedElement.classList.remove(selectedClass);
@@ -1259,4 +1293,4 @@ export default function RootLayout({
       </ServiceWrapper>
     </html>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index e4df74a..272070b 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,8 +1,8 @@
-"use client"
+"use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import HeroBillboard from '@/components/sections/hero/HeroBillboard';
+import HeroOverlay from '@/components/sections/hero/HeroOverlay';
 import TextAbout from '@/components/sections/about/TextAbout';
 import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
 import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
@@ -42,10 +42,9 @@ export default function LandingPage() {
       </div>
 
       <div id="hero" data-section="hero">
-        <HeroBillboard
+        <HeroOverlay
           title="Welcome to Old Boy Domino Club"
           description="Join a thriving community of domino enthusiasts where tradition meets fellowship. Experience the timeless joy of classic domino gaming with friends who share your passion."
-          background={{ variant: "plain" }}
           tag="Est. 1985"
           tagIcon={Dice6}
           imageSrc="https://img.b2bpic.net/free-photo/side-view-glass-tea-with-backgammon-jam-carpet-table_176474-3102.jpg"
@@ -225,4 +224,4 @@ export default function LandingPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index 85bef86..b51123f 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -249,4 +249,4 @@ export default function ProductPage({ params }: ProductPageProps) {
             </ReactLenis>
         </ThemeProvider>
     );
-}
\ No newline at end of file
+}
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 5b0628a..695c055 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -118,4 +118,4 @@ export default function ShopPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
\ No newline at end of file
+}