diff --git a/src/plainui/jinja2/plainui/fahrplan.html.j2 b/src/plainui/jinja2/plainui/fahrplan.html.j2
index 79f6c5e63607d8e1c434a340672b55ddda5c6bc4..7e741ae12e36e9fe905e41a917a810048f4b73eb 100644
--- a/src/plainui/jinja2/plainui/fahrplan.html.j2
+++ b/src/plainui/jinja2/plainui/fahrplan.html.j2
@@ -41,7 +41,7 @@
             <a href="#" class="btn m-2">{{ _("QR-Code") }}</a>
     </div> #}
 
-  <form method="get" action="#now" class="hub-card mb-2">
+  <form method="get" action="#now">
     <input type="hidden" name="mode" value="{{ mode }}">
     {% if show_assembly_filters %}<input type="hidden" name="show_assembly_filters" value="y">{% endif %}
     {% if day %}<input type="hidden" name="day" value="{{ day.index }}">{% endif %}
@@ -51,61 +51,61 @@
     {% if my_fahrplan %}<input type="hidden" name="my" value="y">{% endif %}
     {% if is_recorded is not none %}<input type="hidden" name="rec" value="{{ 'y' if is_recorded else 'n' }}">{% endif %}
 
-    <div class="d-flex gap-3 flex-column flex-md-row align-items-start hub-fahrplan__title mb-2">
-      <div>
+    <ul class="nav nav-pills mb-3">
+      <li class="nav-item">
         <button type="submit"
                 name="set"
                 value="mlist"
-                class="hub-fahrplan__view-toggle {{ 'hub-fahrplan__view-toggle--active' if mode == 'list' }}">
-          {{ _("fahrplan.filters.list") }}
-        </button>
+                class="nav-link {{ 'active' if mode == 'list' }}">{{ _("fahrplan.filters.list") }}</button>
+      </li>
+      <li class="nav-item">
         <button type="submit"
                 name="set"
                 value="mcalendar"
-                class="hub-fahrplan__view-toggle {{ 'hub-fahrplan__view-toggle--active' if mode == 'calendar' }}">
-          {{ _("fahrplan.filters.calendar") }}
-        </button>
+                class="nav-link {{ 'active' if mode == 'calendar' }}">{{ _("fahrplan.filters.calendar") }}</button>
+      </li>
+    </ul>
+
+    <div class="hub-card mb-2">
+      <div class="hub-tags mb-2">
+        {% if user.is_authenticated %}
+          {{ filter_button("fmy", my_fahrplan, _("My Fahrplan") ) }}
+
+          <div class="hub-tag-divider"></div>
+        {% endif %}
+
+        {{ filter_button('kall', kind == 'all', _("all") ) }}
+        {{ filter_button('kofficial' if kind != 'official' else 'kall', kind == 'official', _("curated only") ) }}
+        {{ filter_button('kassembly' if kind != 'assembly' else 'kall', kind == 'assembly', _("assembly only") ) }}
+        {{ filter_button('ksos' if kind != 'sos' else 'kall', kind == 'sos', _("self_organized only") ) }}
       </div>
-    </div>
 
-    <div class="hub-tags mb-2">
-      {% if user.is_authenticated %}
-        {{ filter_button("fmy", my_fahrplan, _("My Fahrplan") ) }}
+      <div class="hub-tags mb-2">
+        {% for d in days %}
+          {{ filter_button('d' ~ (d.index if d != day else '') , d == day, _("Day %(n)s", n=d.index)) }}
+        {%- endfor %}
 
         <div class="hub-tag-divider"></div>
-      {% endif %}
 
-      {{ filter_button('kall', kind == 'all', _("all") ) }}
-      {{ filter_button('kofficial' if kind != 'official' else 'kall', kind == 'official', _("curated only") ) }}
-      {{ filter_button('kassembly' if kind != 'assembly' else 'kall', kind == 'assembly', _("assembly only") ) }}
-      {{ filter_button('ksos' if kind != 'sos' else 'kall', kind == 'sos', _("self_organized only") ) }}
-    </div>
-
-    <div class="hub-tags mb-2">
-      {% for d in days %}
-        {{ filter_button('d' ~ (d.index if d != day else '') , d == day, _("Day %(n)s", n=d.index)) }}
-      {%- endfor %}
-
-      <div class="hub-tag-divider"></div>
+        {{ filter_button("ry" if is_recorded is not true else "r", is_recorded is true, _("recorded only") ) }}
+        {{ filter_button("rn" if is_recorded is not false else "r", is_recorded is false, _("not recorded only") ) }}
+      </div>
 
-      {{ filter_button("ry" if is_recorded is not true else "r", is_recorded is true, _("recorded only") ) }}
-      {{ filter_button("rn" if is_recorded is not false else "r", is_recorded is false, _("not recorded only") ) }}
-    </div>
+      <div class="hub-tags">
+        {{ tagMacros.tag(_("Tracks") , style="clear") }}
 
-    <div class="hub-tags">
-      {{ tagMacros.tag(_("Tracks") , style="clear") }}
+        {% for track in tracks %}{{ track_button(track) }}{%- endfor %}
+        </div>
 
-      {% for track in tracks %}{{ track_button(track) }}{%- endfor %}
+        {# Leave for future, see above
+          {% if show_assembly_filters %}
+          <div class="row justify-content-md-left border">
+              {% for asmbly in assemblies %}
+                  <button type="submit" name="set" value="a{{asmbly.slug if asmbly != assembly else ''}}" class="btn {% if asmbly == assembly %} active{% endif %} col m-2">{{ asmbly.name }}</button>
+              {%- endfor %}
+          </div>
+          {% endif %} #}
       </div>
-
-      {# Leave for future, see above
-        {% if show_assembly_filters %}
-        <div class="row justify-content-md-left border">
-            {% for asmbly in assemblies %}
-                <button type="submit" name="set" value="a{{asmbly.slug if asmbly != assembly else ''}}" class="btn {% if asmbly == assembly %} active{% endif %} col m-2">{{ asmbly.name }}</button>
-            {%- endfor %}
-        </div>
-        {% endif %} #}
     </form>
 
     {% if timezone_warning %}