diff --git a/src/_includes/layouts/main.vto b/src/_includes/layouts/main.vto
index 2871d291..ec9bd5d6 100644
--- a/src/_includes/layouts/main.vto
+++ b/src/_includes/layouts/main.vto
@@ -1,7 +1,4 @@
----
-layout: layouts/base
----
-{{ layout "partials/hero.vto" }}
+{{ layout "layouts/base.vto" }}
 {{ set heroImg }}<img fetchpriority="high" src="/assets/leilukin/Leilukins-Hub-website-banner.avif" alt="Banner of Leilukin's Hub" width="900" height="300">{{ /set }}
 
 {{ set heroDropShadow }}
@@ -139,9 +136,7 @@ function getTodayEvent() {
         return null;
 }
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/navbar.vto" }}
 {{ set navbarLinks }}
 {{ set currentUrl  = page.url  }}
 {{ set navPages = collections["navbar links"] |> eleventyNavigation }}
@@ -151,9 +146,10 @@ function getTodayEvent() {
 </li>
 {{ /for }}
 {{ /set }}
-{{ /layout }}
 
-{{ layout "partials/footer.vto" }}
+{{ content }}
+
+{{ set footerContent }}
 <h2 class="visually-hidden">Footer Navigation:</h2>
 {{ set currentUrl = page.url }}
 <ul class="inline-nav footer__links">
@@ -177,7 +173,6 @@ function getTodayEvent() {
     >{{ statement.data.title }}</a></li>
     {{ /for }}
 </ul>
-{{ set footerContent }}
 <p>Made with ♥ by {{ sitemeta.siteAuthor.name }} since 11 September 2022</p>
 {{ /set }}
 {{ /layout }}