diff --git a/app/views/archive.twig b/app/views/archive.twig
index 472025f..df00d98 100644
--- a/app/views/archive.twig
+++ b/app/views/archive.twig
@@ -1,17 +1,5 @@
 {% extends layout %}
-
-{% block menu %}
-{% set count = entries|length %}
-
-<nav role="navigation">
-    <ul>
-        <li><a href="/">{{ 'unread'|trans }}</a></li>
-        <li>{{ 'starred'|trans }}</li>
-        <li><a href="/archive">{{ 'archive'|trans }}</a> ({{count}})</li>
-        <li><a href="{{ path('add') }}">{{ 'entry.add'|trans }}</a></li>
-    </ul>
-</nav>
-{% endblock %}
+{% block title %}archive{% endblock %}
 
 {% block content %}
 {% if entries is empty %}
@@ -19,16 +7,7 @@
 {% else %}
     <ul>
     {% for entry in entries %}
-    <li>
-        <h2><a href="{{ path('view_entry', {'id': entry.id}) }}">{{ entry.title }}</a></h2>
-        <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
-        <ul>
-            <li>{% if entry.status == "read" %}<a href="{{ path('mark_entry_unread', {'id': entry.id}) }}">{{ 'mark as unread'|trans }}</a>{% else %}<a href="{{ path('mark_entry_read', {'id': entry.id}) }}">{{ 'mark as read'|trans }}</a>{% endif %}</li>
-            <li><a href="#">{{ 'star'|trans }}</a></li>
-            <li><a href="#">{{ 'delete'|trans }}</a></li>
-            <li><a href="{{ entry.url }}">{{ 'view original'|trans }}</a></li>
-        </ul>
-    </li>
+        {% include "entry.twig" %}
     {% endfor %}
     </ul>
 
diff --git a/app/views/bookmarks.twig b/app/views/bookmarks.twig
new file mode 100644
index 0000000..1fc12e2
--- /dev/null
+++ b/app/views/bookmarks.twig
@@ -0,0 +1,16 @@
+{% extends layout %}
+{% block title %}bookmarks{% endblock %}
+
+{% block content %}
+{% if entries is empty %}
+<div class="messages warning"><p>{{ 'No link available here!'|trans }}</p></div>
+{% else %}
+    <ul>
+    {% for entry in entries %}
+        {% include "entry.twig" %}
+    {% endfor %}
+    </ul>
+
+{% endif %}
+
+{% endblock %}
diff --git a/app/views/entry.twig b/app/views/entry.twig
new file mode 100644
index 0000000..4b177d7
--- /dev/null
+++ b/app/views/entry.twig
@@ -0,0 +1,10 @@
+    <li>
+        <h2><a href="{{ path('view_entry', {'id': entry.id}) }}">{{ entry.title }}</a></h2>
+        <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+        <ul>
+            <li>{% if entry.status == "read" %}<a href="{{ path('mark_entry_unread', {'id': entry.id}) }}">{{ 'mark as unread'|trans }}</a>{% else %}<a href="{{ path('mark_entry_read', {'id': entry.id}) }}">{{ 'mark as read'|trans }}</a>{% endif %}</li>
+            <li><a href="#">{% if entry.bookmark == 1 %}<a href="{{ path('unstar_entry', {'id': entry.id}) }}">{{ 'unstar'|trans }}</a>{% else %}<a href="{{ path('star_entry', {'id': entry.id}) }}">{{ 'star'|trans }}</a>{% endif %}</a></li>
+            <li><a href="#">{{ 'delete'|trans }}</a></li>
+            <li><a href="{{ entry.url }}">{{ 'view original'|trans }}</a></li>
+        </ul>
+    </li>
\ No newline at end of file
diff --git a/app/views/index.twig b/app/views/index.twig
index 6dde9b3..9dabe75 100644
--- a/app/views/index.twig
+++ b/app/views/index.twig
@@ -1,17 +1,5 @@
 {% extends layout %}
-
-{% block menu %}
-{% set count = entries|length %}
-
-<nav role="navigation">
-    <ul>
-        <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 title %}unread{% endblock %}
 
 {% block content %}
 {% if entries is empty %}
@@ -19,16 +7,7 @@
 {% else %}
     <ul>
     {% for entry in entries %}
-    <li>
-        <h2><a href="{{ path('view_entry', {'id': entry.id}) }}">{{ entry.title }}</a></h2>
-        <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
-        <ul>
-            <li>{% if entry.status == "read" %}<a href="{{ path('mark_entry_unread', {'id': entry.id}) }}">{{ 'mark as unread'|trans }}</a>{% else %}<a href="{{ path('mark_entry_read', {'id': entry.id}) }}">{{ 'mark as read'|trans }}</a>{% endif %}</li>
-            <li><a href="#">{% if entry.bookmark == 1 %}<a href="{{ path('unstar_entry', {'id': entry.id}) }}">{{ 'unstar'|trans }}</a>{% else %}<a href="{{ path('star_entry', {'id': entry.id}) }}">{{ 'star'|trans }}</a>{% endif %}</a></li>
-            <li><a href="#">{{ 'delete'|trans }}</a></li>
-            <li><a href="{{ entry.url }}">{{ 'view original'|trans }}</a></li>
-        </ul>
-    </li>
+        {% include "entry.twig" %}
     {% endfor %}
     </ul>
 
diff --git a/app/views/layout.twig b/app/views/layout.twig
index c5cb061..f2a56fa 100644
--- a/app/views/layout.twig
+++ b/app/views/layout.twig
@@ -10,7 +10,7 @@
         <!--[if IE]>
         <meta http-equiv="X-UA-Compatible" content="IE=10">
         <![endif]-->
-        <title>poche</title>
+        <title>{% block title %}{% endblock %} – poche</title>
         <link rel="stylesheet" href="/assets/css/knacss.css" media="all">
         <link rel="stylesheet" href="/assets/css/style.css" media="all">
     </head>
@@ -18,7 +18,7 @@
 {% include '_top.twig' %}
         <div id="main">
             <div id="content" class="w600p center">
-            {% block menu %}{% endblock %}
+            {% include "menu.twig" %}
             {% block content %}{% endblock %}
             </div>
         </div>
diff --git a/app/views/menu.twig b/app/views/menu.twig
new file mode 100644
index 0000000..6f6b415
--- /dev/null
+++ b/app/views/menu.twig
@@ -0,0 +1,11 @@
+{% if entries is defined %} 
+{% set count = entries|length %}
+{% endif %}
+<nav role="navigation">
+    <ul>
+        <li><a href="/">{{ 'unread'|trans }}</a>{% if app.request.requesturi == '/' %} ({{count}}){% endif %}</li>
+        <li><a href="/bookmarks">{{ 'bookmarks'|trans }}</a>{% if app.request.requesturi == '/bookmarks' %} ({{count}}){% endif %}</li>
+        <li><a href="/archive">{{ 'archive'|trans }}</a>{% if app.request.requesturi == '/archive' %} ({{count}}){% endif %}</li>
+        <li><a href="{{ path('add') }}">{{ 'entry.add'|trans }}</a></li>
+    </ul>
+</nav>
\ No newline at end of file