diff --git a/src/_components/page/Header.vto b/src/_components/page/Header.vto
new file mode 100644
index 0000000..bb61987
--- /dev/null
+++ b/src/_components/page/Header.vto
@@ -0,0 +1,3 @@
+<header>
+  <h1><a href="/">{{ metas.site }}</a></h1>
+</header>
\ No newline at end of file
diff --git a/src/_components/headerNav.vto b/src/_components/page/Nav.vto
similarity index 71%
rename from src/_components/headerNav.vto
rename to src/_components/page/Nav.vto
index 51dbdba..070fcc0 100644
--- a/src/_components/headerNav.vto
+++ b/src/_components/page/Nav.vto
@@ -1,3 +1,6 @@
+---
+css: 
+---
 <nav>
   <a href="/">Home</a>
 </nav>
\ No newline at end of file
diff --git a/src/_includes/css/wireframe.css b/src/_includes/css/wireframe.css
new file mode 100644
index 0000000..68f653d
--- /dev/null
+++ b/src/_includes/css/wireframe.css
@@ -0,0 +1,3 @@
+header, nav, main, aside, section, footer {
+  outline: 2px dashed var(--wireframe-outline, orange);
+}
diff --git a/src/_includes/layout/page.vto b/src/_includes/layout/page.vto
index 5ba047b..1635ff1 100644
--- a/src/_includes/layout/page.vto
+++ b/src/_includes/layout/page.vto
@@ -12,11 +12,14 @@
   <link rel="stylesheet" href="/css/site.css">
 </head>
 <body>
-  <header>
-    {{ comp.headerNav() }}
-  </header>
+  {{# Site header #}}
+  {{ comp.page.Header(page.data) }}
+
+  {{# Site navigaation #}}
+  {{ comp.page.Nav() }}
 
   <main>
+    <h1>{{ title }}</h1>
     {{ content }}
   </main>
 
diff --git a/src/index.vto b/src/index.vto
index 90a3b95..265257a 100644
--- a/src/index.vto
+++ b/src/index.vto
@@ -1,8 +1,6 @@
 ---
 title: Home
 ---
-<h1>OI Lume Expo</h1>
-
 <p>
   This site collects some common approaches to building Lume sites in use across Open Innovations.
 </p>
