diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
index cdacd5b38..05a316391 100644
--- a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
+++ b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
@@ -53,8 +53,6 @@
     store.setCurrentScreen(screen.title)
     $goto(`./:page/${screen.title}`)
   }
-
-  $: console.log("Params: ", $params)
 </script>
 
 <div class="root">
diff --git a/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte b/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte
new file mode 100644
index 000000000..528170543
--- /dev/null
+++ b/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte
@@ -0,0 +1,14 @@
+<script>
+  import { onMount } from "svelte"
+  import { params } from "@sveltech/routify"
+  import { store } from "builderStore"
+
+  if ($params.screen !== "page-layout") {
+    store.setCurrentScreen($params.screen)
+  } else {
+    store.setScreenType("page")
+  }
+</script>
+
+<slot />
+store.setScreenType("page")
diff --git a/packages/builder/src/pages/[application]/frontend/[page]/_layout.svelte b/packages/builder/src/pages/[application]/frontend/[page]/_layout.svelte
new file mode 100644
index 000000000..d379bba57
--- /dev/null
+++ b/packages/builder/src/pages/[application]/frontend/[page]/_layout.svelte
@@ -0,0 +1,8 @@
+<script>
+  import { params } from "@sveltech/routify"
+  import { store } from "builderStore"
+
+  store.setCurrentPage($params.page)
+</script>
+
+<slot />
diff --git a/packages/builder/src/pages/[application]/frontend/[page]/index.svelte b/packages/builder/src/pages/[application]/frontend/[page]/index.svelte
index 2a02d41ce..e69de29bb 100644
--- a/packages/builder/src/pages/[application]/frontend/[page]/index.svelte
+++ b/packages/builder/src/pages/[application]/frontend/[page]/index.svelte
@@ -1 +0,0 @@
-TEST
diff --git a/packages/builder/src/pages/[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte
index d33b42c3f..24a9821cc 100644
--- a/packages/builder/src/pages/[application]/frontend/_layout.svelte
+++ b/packages/builder/src/pages/[application]/frontend/_layout.svelte
@@ -50,9 +50,6 @@
   }
 
   const lastPartOfName = c => (c ? last(c.split("/")) : "")
-
-  $: console.log("Pages: ", $store.pages[$store.currentPageName])
-  $: console.log("Screens: ", $store.screens)
 </script>
 
 <div class="root">