diff --git a/views/blame.twig b/views/blame.twig
index 56296c3..e942f56 100644
--- a/views/blame.twig
+++ b/views/blame.twig
@@ -1,16 +1,8 @@
-{% extends 'layout.twig' %}
+{% extends 'layout_page.twig' %}
+
 {% block title %}GitList{% endblock %}
 
-{% block body %}
-{% include 'navigation.twig' %}
-
-<div class="container">
-    <div class="row">
-        <div class="span12">
-            {% include 'menu.twig' %}
-        </div>
-    </div>
-
+{% block content %}
     {% include 'breadcrumb.twig' with {breadcrumbs: [{dir: 'Blame', path:''}]} %}
 
     <div class="source-view">
@@ -28,7 +20,4 @@
     </div>
 
     <hr>
-
-    {% include 'footer.twig' %}
-</div>
 {% endblock %}
diff --git a/views/commit.twig b/views/commit.twig
index 1f4bffa..dafbdf6 100644
--- a/views/commit.twig
+++ b/views/commit.twig
@@ -1,16 +1,8 @@
-{% extends 'layout.twig' %}
+{% extends 'layout_page.twig' %}
+
 {% block title %}GitList{% endblock %}
 
-{% block body %}
-{% include 'navigation.twig' %}
-
-<div class="container">
-    <div class="row">
-        <div class="span12">
-            {% include 'menu.twig' %}
-        </div>
-    </div>
-
+{% block content %}
     {% include 'breadcrumb.twig' with {breadcrumbs: [{dir: "Commit #{commit.getHash}", path:''}]} %}
 
     <div class="commit-view">
@@ -49,7 +41,4 @@
     {% endfor %}
 
     <hr>
-
-    {% include 'footer.twig' %}
-</div>
 {% endblock %}
diff --git a/views/commits.twig b/views/commits.twig
index 6e945ab..be131c7 100644
--- a/views/commits.twig
+++ b/views/commits.twig
@@ -1,17 +1,8 @@
-{% extends 'layout.twig' %}
+{% extends 'layout_page.twig' %}
+
 {% block title %}GitList{% endblock %}
 
-{% block body %}
-{% include 'navigation.twig' %}
-
-<div class="container">
-    <div class="row">
-        <div class="span12">
-            {% include 'branch_menu.twig' %}
-            {% include 'menu.twig' %}
-        </div>
-    </div>
-
+{% block content %}
     {% include 'breadcrumb.twig' with {breadcrumbs: [{dir: 'Commit history', path:''}]} %}
 
     {% for date, commit in commits %}
@@ -50,7 +41,4 @@
     </ul>
 
     <hr>
-
-    {% include 'footer.twig' %}
-</div>
 {% endblock %}
diff --git a/views/file.twig b/views/file.twig
index f27fb65..097e2b4 100644
--- a/views/file.twig
+++ b/views/file.twig
@@ -1,17 +1,8 @@
-{% extends 'layout.twig' %}
+{% extends 'layout_page.twig' %}
+
 {% block title %}GitList{% endblock %}
 
-{% block body %}
-{% include 'navigation.twig' %}
-
-<div class="container">
-    <div class="row">
-        <div class="span12">
-            {% include 'branch_menu.twig' %}
-            {% include 'menu.twig' %}
-        </div>
-    </div>
-
+{% block content %}
     {% include 'breadcrumb.twig' with {breadcrumbs: breadcrumbs} %}
 
     <div class="source-view">
@@ -32,7 +23,4 @@
     </div>
 
     <hr>
-
-    {% include 'footer.twig' %}
-</div>
 {% endblock %}
diff --git a/views/layout_page.twig b/views/layout_page.twig
new file mode 100644
index 0000000..41ff4df
--- /dev/null
+++ b/views/layout_page.twig
@@ -0,0 +1,22 @@
+{% extends 'layout.twig' %}
+
+{% block body %}
+    {% include 'navigation.twig' %}
+
+    <div class="container">
+        <div class="row">
+            <div class="span12">
+                {% if branches is defined %}
+                    {% include 'branch_menu.twig' %}
+                {% endif %}
+                {% include 'menu.twig' %}
+            </div>
+        </div>
+
+        {% block content %}{% endblock %}
+
+        <hr>
+
+        {% include 'footer.twig' %}
+    </div>
+{% endblock %}
diff --git a/views/stats.twig b/views/stats.twig
index 81f618d..d56d4ae 100644
--- a/views/stats.twig
+++ b/views/stats.twig
@@ -1,17 +1,8 @@
-{% extends 'layout.twig' %}
+{% extends 'layout_page.twig' %}
+
 {% block title %}GitList{% endblock %}
 
-{% block body %}
-{% include 'navigation.twig' %}
-
-<div class="container">
-    <div class="row">
-        <div class="span12">
-            {% include 'branch_menu.twig' %}
-            {% include 'menu.twig' %}
-        </div>
-    </div>
-
+{% block content %}
     {% include 'breadcrumb.twig' with {breadcrumbs: [{dir: 'Statistics', path:''}]} %}
 
     <table class="table table-striped table-bordered">
@@ -52,7 +43,4 @@
     </table>
 
     <hr>
-
-    {% include 'footer.twig' %}
-</div>
 {% endblock %}
diff --git a/views/tree.twig b/views/tree.twig
index bebb179..64fd669 100644
--- a/views/tree.twig
+++ b/views/tree.twig
@@ -1,17 +1,8 @@
-{% extends 'layout.twig' %}
+{% extends 'layout_page.twig' %}
+
 {% block title %}GitList{% endblock %}
 
-{% block body %}
-{% include 'navigation.twig' %}
-
-<div class="container">
-    <div class="row">
-        <div class="span12">
-            {% include 'branch_menu.twig' %}
-            {% include 'menu.twig' %}
-        </div>
-    </div>
-
+{% block content %}
     {% embed 'breadcrumb.twig' with {breadcrumbs: breadcrumbs} %}
         {% block extra %}
             <a href="{{ path('rss', {repo: repo, branch: branch}) }}"><i class="rss pull-right"></i></a>
@@ -57,9 +48,4 @@
             <div id="readme-content">{{ readme.content }}</div>
         </div>
     {% endif %}
-
-    <hr>
-
-    {% include 'footer.twig' %}
-</div>
 {% endblock %}