diff --git a/_includes/head.html.haml b/_includes/head.html.haml
deleted file mode 100644
index 6e74e9e..0000000
--- a/_includes/head.html.haml
+++ /dev/null
@@ -1,18 +0,0 @@
-%head
-  %meta{:charset => "utf-8"}/
-  %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/
-  %meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}/
-  %title {% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}
-  %meta{:content => "{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}", :name => "description"}/
-%body
-  %p
-    {% assign user_url = site.url | append: site.baseurl %}
-    {% assign full_base_url = user_url | default: site.github.url %}
-    %link{:full_base_url => "", :href => "{{ ", "prepend:" => "", :rel => "stylesheet"}/
-    %link{:href => "/assets/css/site.css", :rel => "stylesheet"}/
-    %link{:href => "{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}", :rel => "canonical"}/
-    %link{:href => "{{ ", "prepend:" => "", :rel => "alternate", "site.baseurl" => "", "site.url" => "", :title => "{{ site.title }}", :type => "application/rss+xml"}/
-    %script{:async => "", :defer => "defer", :src => "https://buttons.github.io/buttons.js"}
-    / Font Include
-    %link{:href => "http://fonts.googleapis.com/css?family=Roboto:400,300,100,100italic,300italic,500,700", :rel => "stylesheet", :type => "text/css"}/
-    {% seo %}
diff --git a/_layouts/typed.html.haml b/_layouts/typed.html.haml
deleted file mode 100644
index 9b8631b..0000000
--- a/_layouts/typed.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-\---
-layout: site
-\---
-.row
-  %div
-    %h1.center
-      {{page.title}}
-    %p.center
-      %span {{page.sub-title}}
-    %ul.nav
-      %li
-        %a{:href => "/typed/typed.html"} Typed
-      %li
-        %a{:href => "/typed/parfait.html"} Parfait
-      %li
-        %a{:href => "/typed/benchmarks.html"} Performance
-      %li
-        %a{:href => "/typed/debugger.html"} Debugger
-      %li
-        %a{:href => "/typed/syntax.html"} Syntax (obsolete)
-  %div
-    {{content}}
diff --git a/app/views/pages/typed/_menu.html.haml b/app/views/pages/typed/_menu.html.haml
new file mode 100644
index 0000000..d3be1db
--- /dev/null
+++ b/app/views/pages/typed/_menu.html.haml
@@ -0,0 +1,10 @@
+.row
+  %ul.nav
+    %li
+      %a{:href => "/typed/typed.html"} Typed
+    %li
+      %a{:href => "/typed/benchmarks.html"} Performance
+    %li
+      %a{:href => "/typed/debugger.html"} Debugger
+    %li
+      %a{:href => "/typed/syntax.html"} Syntax (obsolete)
diff --git a/app/views/pages/typed/benchmarks.html.haml b/app/views/pages/typed/benchmarks.html.haml
index 3828994..bd47be4 100644
--- a/app/views/pages/typed/benchmarks.html.haml
+++ b/app/views/pages/typed/benchmarks.html.haml
@@ -1,8 +1,7 @@
-%hr/
-%p
-  layout: typed
-  title: Simple soml performance numbers
-  —
+= render "pages/typed/menu"
+
+%h1= title "Simple soml performance numbers"
+
 %p
   These benchmarks were made to establish places for optimizations. This early on it is clear that
   performance is not outstanding, but still there were some surprises.
diff --git a/app/views/pages/typed/debugger.html.haml b/app/views/pages/typed/debugger.html.haml
index f3ca82a..781a407 100644
--- a/app/views/pages/typed/debugger.html.haml
+++ b/app/views/pages/typed/debugger.html.haml
@@ -1,8 +1,7 @@
-%hr/
-%p
-  layout: typed
-  title: Register Level Debugger / simulator
-  —
+= render "pages/typed/menu"
+
+%h1= title "Register Level Debugger / simulator"
+
 %h2#views Views
 %p
   From left to right there are several views showing different data and controls.
diff --git a/app/views/pages/typed/syntax.html.haml b/app/views/pages/typed/syntax.html.haml
index 5f5bd60..4a90b33 100644
--- a/app/views/pages/typed/syntax.html.haml
+++ b/app/views/pages/typed/syntax.html.haml
@@ -1,8 +1,7 @@
-%hr/
-%p
-  layout: typed
-  title: Soml Syntax
-  —
+= render "pages/typed/menu"
+
+%h1= title "Soml Syntax"
+
 %h4#top-level-class-and-methods Top level Class and methods
 %p The top level declarations in a file may only be class definitions
 %pre
diff --git a/app/views/pages/typed/typed.html.haml b/app/views/pages/typed/typed.html.haml
index 87e1ee6..e3fab54 100644
--- a/app/views/pages/typed/typed.html.haml
+++ b/app/views/pages/typed/typed.html.haml
@@ -1,9 +1,7 @@
-%hr/
-%p
-  layout: typed
-  title: Typed intermediate representation
-  —
-%h3#intermediate-representation Intermediate representation
+= render "pages/typed/menu"
+
+%h1= title "Typed intermediate representation"
+
 %p
   Compilers use different intermediate representations to go from the source code to a binary,
   which would otherwise be too big a step.