diff --git a/templates/index.html b/templates/index.html
index e8668b4..9066d90 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -12,27 +12,31 @@
 	<div id="header">
 		{% set current_section = get_section(path="_index.md") %}
 		<a href="{{ config.base_url }}">{{ config.title }}</a>
-		<span class="subtitle">{{ current_section.title }}</span>
+		<span class="subtitle">{% block subtitle %}{{ current_section.title }}{% endblock %}</span>
 	</div>
 	<div id="menu">
 		<ul>
-		{% for s in current_section.subsections %}
-			{% set subsection = get_section(path=s) %}
-			<li {% if current_path == subsection.path %}class="active"{% endif %}>
-				<a href="{{ subsection.permalink }}">{{ subsection.title }}</a>
-			</li>
-		{% endfor %}
+			{% block menu %}
+				{% for s in current_section.subsections %}
+					{% set subsection = get_section(path=s) %}
+						<li {% if current_path == subsection.path %}class="active"{% endif %}>
+							<a href="{{ subsection.permalink }}">{{ subsection.title }}</a>
+						</li>
+				{% endfor %}
+			{% endblock %}
 		</ul>
 	</div>
 	<div id="content">
 		<div id="nav">
-			{% if section.pages %}
-			<ul>
-			{% for post in section.pages %}
-				<li><a href="{{ post.permalink }}">{{ post.title }}</a></li>
-			{% endfor %}
-			</ul>
-			{% endif %}
+			{% block nav %}
+				{% if section.pages %}
+					<ul>
+						{% for post in section.pages %}
+							<li><a href="{{ post.permalink }}">{{ post.title }}</a></li>
+						{% endfor %}
+					</ul>
+				{% endif %}
+			{% endblock %}
 		</div>
 		<div id="main">
 			{% block content%}{% endblock %}
diff --git a/templates/page.html b/templates/page.html
index 6fc3f6e..c6f1af5 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,5 +1,31 @@
 {% extends "index.html" %}
 
+{% block subtitle %}
+	{% set current_section = get_section(path=page.ancestors[1]) %}
+	{{ current_section.title }}
+{% endblock %}
+
+
 {% block content %}
 	{{ page.content | safe }}
 {% endblock %}
+
+{% block menu %}
+	{% set global_section = get_section(path="_index.md") %}
+	{% for s in global_section.subsections %}
+		{% set subsection = get_section(path=s) %}
+			<li {% if current_path == subsection.path %}class="active"{% endif %}>
+				<a href="{{ subsection.permalink }}">{{ subsection.title }}</a>
+			</li>
+	{% endfor %}
+{% endblock %}
+
+{% block nav %}
+	{% if current_section.pages %}
+		<ul>
+			{% for post in current_section.pages %}
+				<li><a href="{{ post.permalink }}">{{ post.title }}</a></li>
+			{% endfor %}
+		</ul>
+	{% endif %}
+{% endblock %}
diff --git a/templates/section.html b/templates/section.html
index 77397ce..7d36e58 100644
--- a/templates/section.html
+++ b/templates/section.html
@@ -1,5 +1,9 @@
 {% extends "index.html" %}
 
+{% block subtitle %}
+	{{ section.title }}
+{% endblock %}
+
 {% block content %}
 	<h1>{{ section.title }}</h1>
 	{{ section.content | safe }}