diff --git a/src/plainui/jinja2/plainui/assembly.html b/src/plainui/jinja2/plainui/assembly.html
index aca14f4384a18aa32164cfe5f15260e88aa79181..b1b2abbe848d9673ab9b9420415e036d8561d2de 100644
--- a/src/plainui/jinja2/plainui/assembly.html
+++ b/src/plainui/jinja2/plainui/assembly.html
@@ -69,4 +69,7 @@
{{ list_events.list(sos_private, is_favorite_events, is_scheduled_events ) }}
{% endif %}
</div>
+
+ <hr class="my-11 border-top-0">
+
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/board.html b/src/plainui/jinja2/plainui/board.html
index d9a59af9a32c912576c33d9922e583232606aab6..a055f645afea9477028bba8e4ee0a12d4ae8a559 100644
--- a/src/plainui/jinja2/plainui/board.html
+++ b/src/plainui/jinja2/plainui/board.html
@@ -75,4 +75,7 @@
{% endif %}
{% endfor -%}
</ul>
+
+ <hr class="my-11 border-top-0">
+
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/board_entry.html b/src/plainui/jinja2/plainui/board_entry.html
index 6ee33fd9ca39084e587cf1c248c228e9686da700..2775229fff4dda3657cbaacbf66d3abb0f9f0d33 100644
--- a/src/plainui/jinja2/plainui/board_entry.html
+++ b/src/plainui/jinja2/plainui/board_entry.html
@@ -4,7 +4,7 @@
{% block title %}{{conf.name}} - {{ entry.title }}{% endblock %}
{% block content %}
- <article class="pb-11">
+ <article class="mb-11">
{{ titleMacro.title(title=entry.title,
share_url = url('plainui:board_entry', conf_slug=conf.slug, id=entry.id),
report_url = entry.id,
diff --git a/src/plainui/jinja2/plainui/board_private.html b/src/plainui/jinja2/plainui/board_private.html
index f951722ebe9e5860d668c6cb8c2c9753df26367e..bfdac5c668987b6ba8323b824a06b4cde8928f64 100644
--- a/src/plainui/jinja2/plainui/board_private.html
+++ b/src/plainui/jinja2/plainui/board_private.html
@@ -68,4 +68,7 @@
</li>
{% endfor -%}
</ul>
+
+ <hr class="my-11 border-top-0">
+
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/ccc_events.html b/src/plainui/jinja2/plainui/ccc_events.html
index bac0505b143542e84d196a0b413d3390105d549a..db005daf07a8498c7402b6901bc68c9302c5ea6b 100644
--- a/src/plainui/jinja2/plainui/ccc_events.html
+++ b/src/plainui/jinja2/plainui/ccc_events.html
@@ -20,4 +20,5 @@
{{ list_events.list(events_ccc, is_favorite_events, is_scheduled_events ) }}
</div>
+ <hr class="my-11 border-top-0">
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/conferences.html b/src/plainui/jinja2/plainui/conferences.html
index 2543fa037e8282bb4633749b39b652d1f1ffe344..83291fe879f0f182412003cc9c438361a251ffe2 100644
--- a/src/plainui/jinja2/plainui/conferences.html
+++ b/src/plainui/jinja2/plainui/conferences.html
@@ -2,7 +2,7 @@
{% block title %}{{ _("Conferences") }}{% endblock %}
{% block content %}
{{ titleMacro.title(_("Conferences")) }}
- <ul>
+ <ul class="my-11">
{% for conf in conferences %}
<li><a href="{{ url('plainui:landing', conf_slug=conf.slug) }}">{{conf.name}}</a></li>
{% endfor %}
diff --git a/src/plainui/jinja2/plainui/event.html b/src/plainui/jinja2/plainui/event.html
index 7aa9522ce85a0d32eaf9c5f6d3d51f23a294389f..c54ace95a0d484be03291e4f2c93dba0f70fc8ff 100644
--- a/src/plainui/jinja2/plainui/event.html
+++ b/src/plainui/jinja2/plainui/event.html
@@ -49,6 +49,7 @@
{{ list_events.slider(events_upcoming, is_favorite_events, is_scheduled_events ) }}
</div>
+ <hr class="my-11 border-top-0">
</article>
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/fahrplan.html b/src/plainui/jinja2/plainui/fahrplan.html
index a1d44bd864d67acea53efaefa11c14b28e2425e4..bf80cf662fea877703031b88932a78ea0fecce26 100644
--- a/src/plainui/jinja2/plainui/fahrplan.html
+++ b/src/plainui/jinja2/plainui/fahrplan.html
@@ -73,4 +73,7 @@
{% elif mode == 'calendar' %}
{{ calendar(events) }}
{% endif %}
+
+ <hr class="my-11 border-top-0">
+
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/index.html b/src/plainui/jinja2/plainui/index.html
index 93e54e08b102fa608e57875e716167ab2b789f3a..790286c2a9df0cc308859f2c0f959e82f8d28bae 100644
--- a/src/plainui/jinja2/plainui/index.html
+++ b/src/plainui/jinja2/plainui/index.html
@@ -46,7 +46,7 @@
<hr class="my-8">
-<div class="border p-6 my-8">
+<div class="border p-6 mt-8 mb-11">
TODO: Tracks...
</div>
diff --git a/src/plainui/jinja2/plainui/room.html b/src/plainui/jinja2/plainui/room.html
index c09107bf8480f042aacb3b2583b7b89df143dc21..d2dd77024104a2dc4f0d12493587247b2e01fc29 100644
--- a/src/plainui/jinja2/plainui/room.html
+++ b/src/plainui/jinja2/plainui/room.html
@@ -23,7 +23,7 @@
<p>{{ markdownMacro.markdown(markdown=room.description | safe) }}</p>
{% endif %}
- <div class="mt-4">
+ <div class="mt-4 mb-11">
<h4>{{ _("Links") }}</h4>
<ul>
{% for link in room.links.all() %}
diff --git a/src/plainui/jinja2/plainui/rooms.html b/src/plainui/jinja2/plainui/rooms.html
index a8a3082d1853c4ec6785cd7516b5f2c05edcb959..af545cc56483b9c27c3638831be2e87e0ef7798e 100644
--- a/src/plainui/jinja2/plainui/rooms.html
+++ b/src/plainui/jinja2/plainui/rooms.html
@@ -5,7 +5,7 @@
share_url = url('plainui:rooms', conf_slug=conf.slug),
report_url = url('plainui:rooms', conf_slug=conf.slug)) }}
- <ul>
+ <ul class="mt-8 mb-11">
{% for room in rooms %}
<li><a href="{{ url('plainui:room', conf_slug=conf.slug, room_id=room.id) }}">{{room.name}}</a>
<ul>
diff --git a/src/plainui/jinja2/plainui/search.html b/src/plainui/jinja2/plainui/search.html
index aef6015616fab8356d221a736f82be20e805955a..ed2195ca3d4ca8822b883ce0541018fc4a7a7769 100644
--- a/src/plainui/jinja2/plainui/search.html
+++ b/src/plainui/jinja2/plainui/search.html
@@ -1,7 +1,7 @@
{% extends "plainui/base.html" %}
{% block title %}{{conf.name}} - {{ _("Search Results") }}{% endblock %}
{% block content %}
-<div>
+<div class="mb-11">
<div class="row justify-content-center">
<div class="col-auto"><h1>{{ _("Search Results") }}</h1></div>
<div class="w-100"></div>
diff --git a/src/plainui/jinja2/plainui/stream.html b/src/plainui/jinja2/plainui/stream.html
index aac5f8c2c7a4bcd51cf2ca76ae2c9e66ad9e9df0..7d6cdfd5061d86b8749959f9738498b5db2a115a 100644
--- a/src/plainui/jinja2/plainui/stream.html
+++ b/src/plainui/jinja2/plainui/stream.html
@@ -11,8 +11,9 @@
<p>TODO: Stream</p>
</figure>
- <div class="my-8">
+ <div class="mt-8 mb-11">
<h2 class="mb-5">{{_("External Ressources")}}</h2>
{{ markdownMacro.markdown(markdown="TODO: add some notes as markdown for the livestream event") }}
</div>
+
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/tag.html b/src/plainui/jinja2/plainui/tag.html
index 38c676337c17ef6c35ee6c33b4ec79e44e650dc7..09d4d9c5701d8608784b2fe8b16ac63f84eab082 100644
--- a/src/plainui/jinja2/plainui/tag.html
+++ b/src/plainui/jinja2/plainui/tag.html
@@ -1,7 +1,7 @@
{% extends "plainui/base.html" %}
{% block title %}{{conf.name}} - {{ _("Tag %(name)s", name=tag.slug) }}{% endblock %}
{% block content %}
-<div>
+<div class="mb-11">
<div class="row justify-content-center">
<div class="col-auto"><h1>{{ _("Tag %(name)s", name=tag.slug) }}</h1></div>
<div class="w-100"></div>
diff --git a/src/plainui/jinja2/plainui/upcoming.html b/src/plainui/jinja2/plainui/upcoming.html
index dade71f591b08dfea41623978164133abbcdda25..434e7e578d09faf272d7fff5e0d93d82dccbddf1 100644
--- a/src/plainui/jinja2/plainui/upcoming.html
+++ b/src/plainui/jinja2/plainui/upcoming.html
@@ -5,8 +5,7 @@
{% block content %}
{{ titleMacro.title(_("Upcoming events")) }}
- <h2>{{ _("upcoming events") }}</h2>
- <div class="border p-6">
+ <div class="border mt-8 mb-11 p-6">
{{ list_events.slider(events, my_favorite_events, my_scheduled_events ) }}
</div>
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/user.html b/src/plainui/jinja2/plainui/user.html
index 395b177b6813df4a9b40d8bae3a2da50c6a19dfb..08405936e6942e53be57cc40376ed055af0cdeec 100644
--- a/src/plainui/jinja2/plainui/user.html
+++ b/src/plainui/jinja2/plainui/user.html
@@ -7,7 +7,7 @@
{% block title %}{{ _("%(conf)s - User %(name)s", conf=conf.name, name=display_user.username) }}{% endblock %}
{% block content %}
-<div class="border my-5 p-6">
+<div class="border mt-8 mb-11 p-6">
<div class="row">
<div class="col">
<h2 class="w-100 text-center bg-secondary p-2">{{ display_user.username }}</h2>
@@ -26,7 +26,7 @@
</div>
</div>
-<div class="border my-5 p-6">
+<div class="border my-8 p-6">
<div class="row">
<div class="col">
<h2 class="bg-secondary text-center p-2">{{ _("badges") }}</h2>