diff --git a/seminar/templates/seminar/archiv/cislo.html b/seminar/templates/seminar/archiv/cislo.html
index b20346fc..89e25c17 100644
--- a/seminar/templates/seminar/archiv/cislo.html
+++ b/seminar/templates/seminar/archiv/cislo.html
@@ -1,4 +1,4 @@
-{% extends "seminar/archiv/base.html" %}
+{% extends "seminar/archiv/base_cisla.html" %}
{% block content %}
diff --git a/seminar/templates/seminar/archiv/problem.html b/seminar/templates/seminar/archiv/problem.html
index 0fafb2b4..87dd9bce 100644
--- a/seminar/templates/seminar/archiv/problem.html
+++ b/seminar/templates/seminar/archiv/problem.html
@@ -1,4 +1,4 @@
-{% extends "seminar/archiv/base.html" %}
+{% extends "seminar/archiv/base_ulohy.html" %}
{% load comments %}
diff --git a/seminar/templates/seminar/archiv/rocnik.html b/seminar/templates/seminar/archiv/rocnik.html
index 5cdb6dd3..80cd9142 100644
--- a/seminar/templates/seminar/archiv/rocnik.html
+++ b/seminar/templates/seminar/archiv/rocnik.html
@@ -1,4 +1,4 @@
-{% extends "seminar/archiv/base.html" %}
+{% extends "seminar/archiv/base_cisla.html" %}
{% block content %}
diff --git a/seminar/templates/seminar/archiv/submenu.html b/seminar/templates/seminar/archiv/submenu.html
index fb0bd921..234a0f7c 100644
--- a/seminar/templates/seminar/archiv/submenu.html
+++ b/seminar/templates/seminar/archiv/submenu.html
@@ -1,9 +1,9 @@
{% with "/archiv" as cesta %}
{% endwith %}
diff --git a/seminar/templates/seminar/archiv/temata.html b/seminar/templates/seminar/archiv/temata.html
index 640d047b..44e40ef2 100644
--- a/seminar/templates/seminar/archiv/temata.html
+++ b/seminar/templates/seminar/archiv/temata.html
@@ -1,4 +1,4 @@
-{% extends "seminar/archiv/base.html" %}
+{% extends "seminar/archiv/base_temata.html" %}
{% block content %}
diff --git a/seminar/templates/seminar/clanky/base.html b/seminar/templates/seminar/clanky/base.html
index 8698808e..45c022aa 100644
--- a/seminar/templates/seminar/clanky/base.html
+++ b/seminar/templates/seminar/clanky/base.html
@@ -1,5 +1,7 @@
{% extends "base.html" %}
+{% block menu_clanky %}selected{% endblock %}
+
{% block submenu %}
{% include "seminar/clanky/submenu.html" %}
{% endblock %}
diff --git a/seminar/templates/seminar/clanky/submenu.html b/seminar/templates/seminar/clanky/submenu.html
index ee6ebcdc..e909c7f1 100644
--- a/seminar/templates/seminar/clanky/submenu.html
+++ b/seminar/templates/seminar/clanky/submenu.html
@@ -1,9 +1,9 @@
{% with "/clanky" as cesta %}
{% endwith %}
diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html
index d3b79982..f384dc10 100644
--- a/seminar/templates/seminar/cojemam/organizatori.html
+++ b/seminar/templates/seminar/cojemam/organizatori.html
@@ -7,6 +7,13 @@
{% endif %}
{% endblock%}{% endblock%}
+{% block menu_uvod %}selected{% endblock %}
+{% block submenu %}
+ {% with "org" as selected %}
+ {% include "seminar/cojemam/submenu.html" %}
+ {% endwith %}
+{% endblock %}
+
{% block content %}
{% if not aktivni %}
diff --git a/seminar/templates/seminar/cojemam/submenu.html b/seminar/templates/seminar/cojemam/submenu.html
index f130e583..2fe62d2f 100644
--- a/seminar/templates/seminar/cojemam/submenu.html
+++ b/seminar/templates/seminar/cojemam/submenu.html
@@ -1,10 +1,10 @@
{% with "/co-je-MaM" as cesta %}
{% endwith %}
diff --git a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html
index e1b12482..a6c07ea0 100644
--- a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html
+++ b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html
@@ -1,5 +1,12 @@
{% extends "seminar/soustredeni/base.html" %}
+{% block menu_soustredeni %}selected{% endblock %}
+{% block submenu %}
+ {% with "probehlo" as selected %}
+ {% include "seminar/soustredeni/submenu.html" %}
+ {% endwith %}
+{% endblock submenu %}
+
{% block content %}{% if user.is_authenticated %}{# PRACUJE SE STRANKA #}
diff --git a/seminar/templates/seminar/soustredeni/submenu.html b/seminar/templates/seminar/soustredeni/submenu.html
index c1e9deed..d3ef4b18 100644
--- a/seminar/templates/seminar/soustredeni/submenu.html
+++ b/seminar/templates/seminar/soustredeni/submenu.html
@@ -1,9 +1,9 @@
{% with "/soustredeni" as cesta %}
{% endwith %}
diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html
index 8ae89be1..2bda6387 100644
--- a/seminar/templates/seminar/zadani/AktualniZadani.html
+++ b/seminar/templates/seminar/zadani/AktualniZadani.html
@@ -1,5 +1,11 @@
{% extends "seminar/zadani/base.html" %}
+{% block submenu %}
+ {% with "aktualni" as selected %}
+ {% include 'seminar/zadani/submenu.html' %}
+ {% endwith %}
+{% endblock submenu %}
+
{% block content %}
diff --git a/seminar/templates/seminar/zadani/Temata.html b/seminar/templates/seminar/zadani/Temata.html
index ca1c31b4..87aa8e33 100644
--- a/seminar/templates/seminar/zadani/Temata.html
+++ b/seminar/templates/seminar/zadani/Temata.html
@@ -1,5 +1,12 @@
{% extends "seminar/zadani/base.html" %}
+{% block submenu %}
+ {% with "temata" as selected %}
+ {% include 'seminar/zadani/submenu.html' %}
+ {% endwith %}
+{% endblock submenu %}
+
+
{% block content %}
{% with nastaveni.aktualni_rocnik as ar %}
diff --git a/seminar/templates/seminar/zadani/base.html b/seminar/templates/seminar/zadani/base.html
index ba4148aa..043fe401 100644
--- a/seminar/templates/seminar/zadani/base.html
+++ b/seminar/templates/seminar/zadani/base.html
@@ -1,5 +1,7 @@
{% extends "base.html" %}
+{% block menu_zadani %}selected{% endblock %}
+
{% block submenu %}
{% include 'seminar/zadani/submenu.html' %}
{% endblock submenu %}
diff --git a/seminar/templates/seminar/zadani/submenu.html b/seminar/templates/seminar/zadani/submenu.html
index 92c10be5..1ff532ab 100644
--- a/seminar/templates/seminar/zadani/submenu.html
+++ b/seminar/templates/seminar/zadani/submenu.html
@@ -1,11 +1,11 @@
{% with "/zadani" as cesta %}
{% endwith %}
diff --git a/seminar/urls.py b/seminar/urls.py
index cfb8a658..476cf3f1 100644
--- a/seminar/urls.py
+++ b/seminar/urls.py
@@ -13,7 +13,7 @@ urlpatterns = patterns('',
url(r'^cislo/(?P
\d+)\.(?P[0-9-]+)/$', views.CisloView.as_view(), name='seminar_cislo'),
url(r'^problem/(?P\d+)/$', views.ProblemView.as_view(), name='seminar_problem'),
- url(r'^soustredeni/$', views.SoustredeniListView.as_view(),
+ url(r'^soustredeni/probehlo/$', views.SoustredeniListView.as_view(),
name = 'seminar_seznam_soustredeni'),
url(r'^soustredeni/(?P\d+)/$', views.SoustredeniView.as_view(), name='seminar_soustredeni'),