diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html
index 96879514..a06803b8 100644
--- a/mamweb/templates/menu.html
+++ b/mamweb/templates/menu.html
@@ -1,3 +1,12 @@
-{% load i18n cache %}
+{% load i18n cache mam_menu %}
+{% aktualni_rocniky as rs %}
 
-MENU
+<h2>MENU</h2>
+
+<p><a href='{% url 'seminar.aktualni_zadani' %}'>Aktuální zadání</a>
+
+<ul>
+{% for r in rs %}
+<li><a href='{% url 'seminar.rocnik' r.id %}'>Ročník {{ r }}</a>
+{% endfor %}
+</ul>
diff --git a/seminar/templates/seminar/cislo.html b/seminar/templates/seminar/cislo.html
index be2b7df3..ad2aa215 100644
--- a/seminar/templates/seminar/cislo.html
+++ b/seminar/templates/seminar/cislo.html
@@ -5,7 +5,7 @@
 <div>
   <h2>Číslo {{ cislo }}</h2>
 
-  <p>Ročník {% url 'seminar.rocnik' cislo.rocnik.id %}
+  <p><a href='{% url 'seminar.rocnik' cislo.rocnik.id %}'>Ročník {{ cislo.rocnik }}</a>
 
   <h3>Zadané problémy</h3>
   <ul>
diff --git a/seminar/templatetags/__init__.py b/seminar/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/seminar/templatetags/mam_menu.py b/seminar/templatetags/mam_menu.py
new file mode 100644
index 00000000..bf0ec3d4
--- /dev/null
+++ b/seminar/templatetags/mam_menu.py
@@ -0,0 +1,15 @@
+from django import template
+
+from seminar.models import Rocnik
+
+register = template.Library()
+
+@register.inclusion_tag('results.html')
+def seminar_rocniky(parser, token):
+    return {
+        'rocniky': Rocnik.objects.all()
+    }
+
+@register.assignment_tag
+def aktualni_rocniky():
+    return Rocnik.objects.all()