diff --git a/src/app/(frontend)/[slug]/page.tsx b/src/app/(frontend)/[slug]/page.tsx
index 030cf62..f066c77 100644
--- a/src/app/(frontend)/[slug]/page.tsx
+++ b/src/app/(frontend)/[slug]/page.tsx
@@ -73,9 +73,13 @@ export default async function Page({ params: paramsPromise }: Args) {
   const { hero, layout } = page
 
 
-  if (decodedSlug === 'home') {
-    return <HeroPage richText={hero.richText} links={hero.links} layout={layout} />
-  }
+ if (decodedSlug === 'home') {
+  return (
+    <HeroPage richText={hero.richText} links={hero.links}>
+      <RenderBlocks blocks={layout} />
+    </HeroPage>
+  )
+}
 
   return (
     <div style={{ position: 'relative', minHeight: '100vh' }}>
diff --git a/src/components/HeroPage.tsx b/src/components/HeroPage.tsx
index 62d5202..6a78675 100644
--- a/src/components/HeroPage.tsx
+++ b/src/components/HeroPage.tsx
@@ -10,7 +10,6 @@ import { useThemeMode } from '@/hooks/useThemeMode'
 import { CMSLink } from '@/components/Link'
 import RichText from '@/components/RichText'
 import type { Page } from '@/payload-types'
-import { RenderBlocks } from '@/blocks/RenderBlocks'
 import { Button } from '@/components/ui/button'
 
 // ─── Types ────────────────────────────────────────────────────────────────────
@@ -285,10 +284,10 @@ function LogosSection({ isDark }: { isDark: boolean }) {
 interface HeroPageProps {
   richText?: Page['hero']['richText']
   links?: Page['hero']['links']
-  layout?: Page['layout']
+  children?: React.ReactNode
 }
 
-export default function HeroPage({ richText, links, layout }: HeroPageProps) {
+export default function HeroPage({ richText, links, children }: HeroPageProps) {
   const { isDark, toggle } = useThemeMode()
 
   return (
@@ -303,10 +302,10 @@ export default function HeroPage({ richText, links, layout }: HeroPageProps) {
       <div style={{ position: 'relative', zIndex: 1 }}>
         <main>
           <HeroSection isDark={isDark} richText={richText} links={links} />
-          <LogosSection isDark={isDark} />
-                    {layout && layout.length > 0 && (
+                    <LogosSection isDark={isDark} />
+          {children && (
             <div id="skills">
-              <RenderBlocks blocks={layout} />
+              {children}
             </div>
           )}
         </main>