diff --git a/app/views/add.twig b/app/views/add.twig
index 76bd0a4..4008c2a 100644
--- a/app/views/add.twig
+++ b/app/views/add.twig
@@ -1,7 +1,21 @@
 {% extends layout %}
 
+{% block menu %}
+
+<nav role="navigation">
+    <ul>
+        <li><a href="/">{{ 'unread'|trans }}</a></li>
+        <li>{{ 'starred'|trans }}</li>
+        <li><a href="/archive">{{ 'archive'|trans }}</a></li>
+        <li><a href="{{ path('add') }}">{{ 'entry.add'|trans }}</a></li>
+    </ul>
+</nav>
+{% endblock %}
+
 {% block content %}
 
+<h2>{{ 'entry.add'|trans }}</h2>
+
 <form action="#" method="post">
     {{ form_widget(form) }}
 
diff --git a/app/views/archive.twig b/app/views/archive.twig
index b0229dc..d6506c8 100644
--- a/app/views/archive.twig
+++ b/app/views/archive.twig
@@ -1,16 +1,19 @@
 {% extends layout %}
 
-{% block content %}
+{% block menu %}
 {% set count = entries|length %}
 
 <nav role="navigation">
     <ul>
-        <li><a href="/">{{ 'unread'|trans }}</a></li>
+        <li><a href="/">{{ 'unread'|trans }}</a> ({{count}})</li>
         <li>{{ 'starred'|trans }}</li>
-        <li><a href="/archive">{{ 'archive'|trans }}</a> ({{count}})</li>
+        <li><a href="/archive">{{ 'archive'|trans }}</a></li>
+        <li><a href="{{ path('add') }}">{{ 'entry.add'|trans }}</a></li>
     </ul>
 </nav>
+{% endblock %}
 
+{% block content %}
 {% if entries is empty %}
 <div class="messages warning"><p>{{ 'No link available here!'|trans }}</p></div>
 {% else %}
@@ -28,7 +31,6 @@
     </li>
     {% endfor %}
     </ul>
-    <p><a href="{{ path('add') }}">{{ 'entry.add'|trans }}</a></p>
 
 {% endif %}
 
diff --git a/app/views/index.twig b/app/views/index.twig
index 0dcd2fc..f74a85d 100644
--- a/app/views/index.twig
+++ b/app/views/index.twig
@@ -1,6 +1,6 @@
 {% extends layout %}
 
-{% block content %}
+{% block menu %}
 {% set count = entries|length %}
 
 <nav role="navigation">
@@ -8,9 +8,12 @@
         <li><a href="/">{{ 'unread'|trans }}</a> ({{count}})</li>
         <li>{{ 'starred'|trans }}</li>
         <li><a href="/archive">{{ 'archive'|trans }}</a></li>
+        <li><a href="{{ path('add') }}">{{ 'entry.add'|trans }}</a></li>
     </ul>
 </nav>
+{% endblock %}
 
+{% block content %}
 {% if entries is empty %}
 <div class="messages warning"><p>{{ 'No link available here!'|trans }}</p></div>
 {% else %}
diff --git a/app/views/layout.twig b/app/views/layout.twig
index ab023ee..c5cb061 100644
--- a/app/views/layout.twig
+++ b/app/views/layout.twig
@@ -18,6 +18,7 @@
 {% include '_top.twig' %}
         <div id="main">
             <div id="content" class="w600p center">
+            {% block menu %}{% endblock %}
             {% block content %}{% endblock %}
             </div>
         </div>