diff --git a/templates/index.html b/templates/index.html
index bb9e734..e22cb69 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,12 +10,12 @@
 </head>
 <body>
 	<div id="header">
+		{% set current_section = get_section(path="_index.md") %}
 		<a href="{{ config.base_url }}">{{ config.title }}</a>
-		<span class="subtitle">{{ section.title }}</span>
+		<span class="subtitle">{{ current_section.title }}</span>
 	</div>
 	<div id="menu">
 		<ul>
-		{% set current_section = get_section(path="_index.md") %}
 		{% for s in current_section.subsections %}
 			{% set subsection = get_section(path=s) %}
 			<li {% if current_path == subsection.path %}class="active"{% endif %}>
diff --git a/templates/page.html b/templates/page.html
index e69de29..09763b9 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -0,0 +1 @@
+{% extends "index.html" %}
