diff --git a/templates/__nav_link.html b/templates/__nav_link.html
index eaad681..5a0c2e3 100644
--- a/templates/__nav_link.html
+++ b/templates/__nav_link.html
@@ -13,11 +13,9 @@
                 text-uppercase
                 link-light
                 nav-link
+                {% if highlighted %} PC-nav-link-highlight {% endif %}
                 {# links to currently shown page are different (only those without an anchor) #}
-                {% if request.path == link and not anchor %}
-                fw-semibold
-                {% endif %}
-                {{ class }}
+                {% if request.path == link and not anchor %} fw-semibold {% endif %}
             "
             {% if request.path == link and not anchor %}
             aria-current="page"
diff --git a/templates/_menu_base.html b/templates/_menu_base.html
index 5ac9967..7d57a8d 100644
--- a/templates/_menu_base.html
+++ b/templates/_menu_base.html
@@ -24,7 +24,7 @@
         {% endblock %}
 
         {% block link_tickets %}
-            {% include '__nav_link.html' with url='tickets' link_text='Tickets' class='PC-nav-link-highlight' %}
+            {% include '__nav_link.html' with url='tickets' link_text='Tickets' highlighted='1' %}
             {% if phases.ticket_sale == 'launched' %}{% endif %}
         {% endblock %}
 
@@ -38,7 +38,7 @@
         {% endblock %}
 
         {% block link_call_for_proposals %}
-            {% comment %}{% include '__nav_link.html' with url='cfp' link_text='Call for Proposals' class="PC-nav-link-highlight" %}{% endcomment %}
+            {% comment %}{% include '__nav_link.html' with url='cfp' link_text='Call for Proposals' highlighted='1' %}{% endcomment %}
             {% include '__nav_link.html' with url='cfp' link_text='Call for Proposals' %}
             {% if phases.cfp == 'launched' %} {% endif %}
         {% endblock %}
diff --git a/templates/pages/__keynoters.html b/templates/pages/__keynoters.html
index 28fd1e3..1c200a4 100644
--- a/templates/pages/__keynoters.html
+++ b/templates/pages/__keynoters.html
@@ -12,7 +12,7 @@ <h2 class="text-white mt-4 mb-5 h1">Keynote speakers</h2>
                             <img class="img-fluid" src="{% static 'img/speakers/evelina-gabasova.webp' %}" width="800" height="800" alt="">
                         </div>
                     </div>
-                    <div class="col px-3 px-xxs-4 px-sm-5 pb-xs-4 pt-2">
+                    <div class="col px-3 px-xxs-4 px-sm-5 pb-xs-4 pt-2 pt-xl-3">
                         <h3 class="h1 mt-3 mt-sm-4">Evelina Gabašová</h3>
                         <ul class="list-inline font-monospace">
                             <li class="list-inline-item"><a href="https://github.com/evelinag"><i class="bi-github link-primary me-2"></i>evelinag</a></li>
@@ -33,7 +33,7 @@ <h3 class="h1 mt-3 mt-sm-4">Evelina Gabašová</h3>
                             <img class="img-fluid" src="{% static 'img/speakers/prokop-bartonicek.webp' %}" width="800" height="800" alt="">
                         </div>
                     </div>
-                    <div class="col px-3 px-xxs-4 px-sm-5 pb-xs-4 pt-2">
+                    <div class="col px-3 px-xxs-4 px-sm-5 pb-xs-4 pt-2 pt-xl-3">
                         <h3 class="h1 mt-3 mt-sm-4">Prokop Bartoníček</h3>
                         <ul class="list-inline font-monospace">
                             <li class="list-inline-item"><a href="https://www.prokopbartonicek.com"><i class="bi-globe link-primary me-2"></i>prokopbartonicek.com</a></li>
@@ -52,7 +52,7 @@ <h3 class="h1 mt-3 mt-sm-4">Prokop Bartoníček</h3>
                             <img class="img-fluid" src="{% static 'img/speakers/karel-minarik.webp' %}" width="800" height="800" alt="">
                         </div>
                     </div>
-                    <div class="col px-3 px-xxs-4 px-sm-5 pb-xs-4 pt-2">
+                    <div class="col px-3 px-xxs-4 px-sm-5 pb-xs-4 pt-2 pt-xl-3">
                         <h3 class="h1 mt-3 mt-sm-4">Karel Minařík</h3>
                         <ul class="list-inline font-monospace">
                             <li class="list-inline-item"><a href="https://github.com/karmi"><i class="bi-github link-primary me-2"></i>karmi</a></li>
@@ -73,7 +73,7 @@ <h3 class="h1 mt-3 mt-sm-4">Karel Minařík</h3>
                             <img class="img-fluid" src="{% static 'img/speakers/katerina-falk.webp' %}" width="800" height="800" alt="">
                         </div>
                     </div>
-                    <div class="col px-3 px-xxs-4 px-sm-5 pb-xs-4 pt-2">
+                    <div class="col px-3 px-xxs-4 px-sm-5 pb-xs-4 pt-2 pt-xl-3">
                         <h3 class="h1 mt-3 mt-sm-4">Kateřina Falk</h3>
                         <ul class="list-inline font-monospace">
                             <li class="list-inline-item"><a href="https://www.linkedin.com/in/katerina-falk-a450147/"><i class="bi-linkedin link-primary me-2"></i>LinkedIn</a></li>