diff --git a/core/templates/core/_edit_form.html b/core/templates/core/_edit_form.html
index f251d00..4a0c152 100644
--- a/core/templates/core/_edit_form.html
+++ b/core/templates/core/_edit_form.html
@@ -11,10 +11,10 @@
     </div>
     <textarea class="form-control" name="content" rows="5" x-model="text" @keydown="onKeydown($event)" @input="onInput($event)" @paste="handlePaste($event)">{{ item.content }}</textarea>
     <textarea class="form-control" name="comment" rows="3" placeholder="{% trans 'Comment, e.g. same task already captured [[12]]' %}" @keydown="onKeydown($event)" @input="onInput($event)" @paste="handlePaste($event)">{{ item.comment }}</textarea>
-    {% include 'core/_format_toolbar.html' %}
-    <div class="slash-menu list-group shadow" x-show="open" @click.outside="open=false" x-cloak>
+    <div class="slash-menu composer-slash-menu list-group shadow" x-show="open" @click.outside="open=false" x-cloak>
       <template x-for="(cmd, idx) in filtered" :key="cmd.token"><div><div x-show="cmd.group && (idx === 0 || filtered[idx-1].group !== cmd.group)" class="slash-group-header" x-text="cmd.group"></div><button type="button" class="list-group-item list-group-item-action w-100 text-start" :class="{'active': idx === active}" @mouseenter="active=idx" @mousedown.prevent="insert(cmd.token)"><strong x-text="cmd.token"></strong> <span class="text-muted" x-text="cmd.label"></span></button></div></template>
     </div>
+    {% include 'core/_format_toolbar.html' %}
     <div class="row g-2">
       <div class="col-md-4"><select class="form-select" name="visibility">
         <option value="private" {% if item.visibility == 'private' %}selected{% endif %}>{% trans "Private" %}</option>
diff --git a/core/templates/core/base.html b/core/templates/core/base.html
index de6fc5f..a42a5ea 100644
--- a/core/templates/core/base.html
+++ b/core/templates/core/base.html
@@ -17,11 +17,25 @@
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
   <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js"></script>
   <style>
-    body{background:linear-gradient(180deg,#f8fafc 0,#f7f7f4 18rem);color:#1f2937}.shell{max-width:960px}.navbar{box-shadow:0 .35rem 1.25rem rgba(15,23,42,.06)}.navbar a{text-decoration:none}.nav-soft{color:#475569!important;font-weight:500;padding:.2rem .35rem;border-radius:.5rem}.nav-soft:hover{color:#0d6efd!important;background:#eff6ff}.user-menu-btn{min-width:9rem}.card{border:0}.item-card{border:0;border-radius:1.1rem;box-shadow:0 .45rem 1.4rem rgba(15,23,42,.07)!important}.filter-panel{padding:.25rem .15rem}.border{border-color:rgba(15,23,42,.10)!important}.text-bg-light{background:#f1f5f9!important;color:#475569!important}.btn{border-radius:.7rem}.form-control,.form-select{border-color:#e2e8f0;border-radius:.75rem}.content p:last-child{margin-bottom:0}.tag{font-size:.85rem}.slash-menu{position:absolute;z-index:20;top:100%;left:0;width:18rem}.slash-group-header{padding:.35rem .75rem .2rem;background:#f8fafc;color:#94a3b8;font-size:.65rem;font-weight:600;letter-spacing:.06em;text-transform:uppercase;border-top:1px solid #eef2f7}.slash-menu>div:first-of-type .slash-group-header{border-top:0}.slash-menu>div>.list-group-item{border-left:0;border-right:0;border-radius:0}.format-toolbar{position:relative;display:flex;align-items:center}.format-options{position:absolute;z-index:19;left:0;top:calc(100% + .35rem);display:flex;align-items:center;gap:.2rem;padding:.35rem;background:white;border:1px solid #e2e8f0;border-radius:.75rem}.format-options .btn{min-width:2rem}.format-divider{width:1px;height:1.5rem;background:#e2e8f0;margin:0 .15rem}.done{opacity:.6}.done .content{text-decoration:line-through}.content img{max-width:100%;max-height:420px;border-radius:.5rem;border:1px solid #ddd;padding:.25rem;background:white}.overview-content{max-height:calc(var(--overview-lines) * 1.55em);overflow:hidden}.overview-content.expanded{max-height:none}.content{min-width:0;max-width:100%;overflow-wrap:anywhere}.content pre{position:relative;display:block;width:100%;max-width:100%;box-sizing:border-box;background:#1f2937;color:#f9fafb;border-radius:.6rem;padding:1rem;overflow-x:auto;overflow-y:auto;white-space:pre}.content pre code{display:block;color:inherit;white-space:pre;min-width:0}.copy-code{position:absolute;top:.4rem;right:.4rem;line-height:1}.copy-item{position:absolute;right:.75rem;bottom:.5rem;line-height:1;opacity:0;transition:opacity .15s}.item-card:hover .copy-item,.copy-item:focus{opacity:.7}.copy-item:hover{opacity:1!important}.mobile-create-buttons,.mobile-create-nav,.mobile-tags,.mobile-media,.mobile-tag-picker,.mobile-bottom-nav{display:none}.mobile-tag-popup{position:fixed;inset:auto .75rem 1rem .75rem;z-index:1050;max-height:55vh;overflow:auto}.mobile-tag-backdrop{position:fixed;inset:0;background:rgba(0,0,0,.25);z-index:1040}.camera-input{max-width:13rem}@media (max-width: 767.98px){body{padding-bottom:4.25rem}.shell{max-width:100%}main.container{padding:.25rem .75rem 1rem}.navbar .container{gap:.5rem}.navbar-brand{font-size:1rem}.navbar .d-flex{gap:.5rem!important}.user-menu-btn{min-width:auto;max-width:9rem}.item-card{border-radius:.75rem}.item-actions{width:100%;justify-content:stretch!important}.item-action-btn{flex:1 1 0;min-width:0}.mobile-create-buttons,.mobile-tags,.mobile-media{display:flex!important}.mobile-bottom-nav{display:flex!important;position:fixed;left:.75rem;right:.75rem;bottom:.75rem;z-index:1060;background:white;border-radius:1rem;box-shadow:0 .5rem 1.5rem rgba(15,23,42,.18);padding:.35rem}.mobile-bottom-nav .btn{font-size:.8rem;padding:.45rem .25rem}.mobile-tag-picker{display:block!important}.desktop-quick-create{display:none!important}.mobile-create-nav{display:none!important}.desktop-file{display:none!important}.mobile-create-buttons{position:sticky;top:57px;z-index:10;background:#f7f7f4;padding:.35rem 0}.toolbar-filter{display:block;background:#f7f7f4;border-top:4px solid #fff;padding:.35rem .75rem .5rem;box-shadow:0 .4rem .9rem rgba(15,23,42,.05)}.mobile-filter-sidebar{display:none}.filter-panel{background:#f7f7f4;padding:0}.filter-panel-title{display:block;margin:0 0 .3rem!important;font-size:.82rem;color:#64748b;line-height:1}.filter-row{display:grid;grid-template-columns:repeat(5,minmax(0,1fr)) 2.25rem;gap:.25rem;width:100%}.filter-row .btn,.filter-row summary{width:100%;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding-left:.1rem;padding-right:.1rem}.mobile-filter-toggle{position:absolute;opacity:0;pointer-events:none}.mobile-filter-more{grid-column:6;grid-row:1;position:relative;border:0;background:transparent;color:#475569;font-size:1.2rem;line-height:1;text-align:center;cursor:pointer}.mobile-filter-more .badge{position:absolute;top:-.15rem;right:.15rem;font-size:.55rem;line-height:1;padding:.12rem .25rem}.mobile-filter-details{display:none;grid-column:1/-1;grid-row:2;margin-top:.45rem;padding:.75rem;background:white;border-radius:1rem;box-shadow:0 .35rem 1rem rgba(15,23,42,.12)}.mobile-filter-toggle:checked ~ .mobile-filter-details{display:block}.quick-actions{flex-wrap:wrap}.quick-actions .form-control{min-width:100%}.slash-menu{width:calc(100vw - 1.5rem)}textarea.form-control-lg{font-size:1rem}.btn{touch-action:manipulation}.item-row{flex-direction:column}.item-actions{align-self:flex-end}.item-main{width:100%;min-width:0}.copy-item{opacity:.65}}
+    body{background:linear-gradient(180deg,#f8fafc 0,#f7f7f4 18rem);color:#1f2937}.shell{max-width:960px}.navbar{box-shadow:0 .35rem 1.25rem rgba(15,23,42,.06)}.navbar a{text-decoration:none}.nav-soft{color:#475569!important;font-weight:500;padding:.2rem .35rem;border-radius:.5rem}.nav-soft:hover{color:#0d6efd!important;background:#eff6ff}.user-menu-btn{min-width:9rem}.card{border:0}.item-card{border:0;border-radius:1.1rem;box-shadow:0 .45rem 1.4rem rgba(15,23,42,.07)!important}.filter-panel{padding:.25rem .15rem}.border{border-color:rgba(15,23,42,.10)!important}.text-bg-light{background:#f1f5f9!important;color:#475569!important}.btn{border-radius:.7rem}.form-control,.form-select{border-color:#e2e8f0;border-radius:.75rem}.content p:last-child{margin-bottom:0}.tag{font-size:.85rem}.slash-menu{position:absolute;z-index:20;top:100%;left:0;width:18rem}.slash-group-header{padding:.35rem .75rem .2rem;background:#f8fafc;color:#94a3b8;font-size:.65rem;font-weight:600;letter-spacing:.06em;text-transform:uppercase;border-top:1px solid #eef2f7}.slash-menu>div:first-of-type .slash-group-header{border-top:0}.slash-menu>div>.list-group-item{border-left:0;border-right:0;border-radius:0}.composer-slash-menu{position:relative;top:auto;left:auto;width:100%;max-width:28rem;margin-top:.25rem;overflow:hidden;border-radius:.75rem}.format-toolbar{position:relative;display:flex;align-items:center}.format-options{position:absolute;z-index:19;left:0;top:calc(100% + .35rem);display:flex;align-items:center;gap:.2rem;padding:.35rem;background:white;border:1px solid #e2e8f0;border-radius:.75rem}.format-options .btn{min-width:2rem}.format-divider{width:1px;height:1.5rem;background:#e2e8f0;margin:0 .15rem}.done{opacity:.6}.done .content{text-decoration:line-through}.content img{max-width:100%;max-height:420px;border-radius:.5rem;border:1px solid #ddd;padding:.25rem;background:white}.overview-content{max-height:calc(var(--overview-lines) * 1.55em);overflow:hidden}.overview-content.expanded{max-height:none}.content{min-width:0;max-width:100%;overflow-wrap:anywhere}.content pre{position:relative;display:block;width:100%;max-width:100%;box-sizing:border-box;background:#1f2937;color:#f9fafb;border-radius:.6rem;padding:1rem;overflow-x:auto;overflow-y:auto;white-space:pre}.content pre code{display:block;color:inherit;white-space:pre;min-width:0}.copy-code{position:absolute;top:.4rem;right:.4rem;line-height:1}.copy-item{position:absolute;right:.75rem;bottom:.5rem;line-height:1;opacity:0;transition:opacity .15s}.item-card:hover .copy-item,.copy-item:focus{opacity:.7}.copy-item:hover{opacity:1!important}.mobile-create-buttons,.mobile-create-nav,.mobile-tags,.mobile-media,.mobile-tag-picker,.mobile-bottom-nav{display:none}.mobile-tag-popup{position:fixed;inset:auto .75rem 1rem .75rem;z-index:1050;max-height:55vh;overflow:auto}.mobile-tag-backdrop{position:fixed;inset:0;background:rgba(0,0,0,.25);z-index:1040}.camera-input{max-width:13rem}@media (max-width: 767.98px){body{padding-bottom:4.25rem}.shell{max-width:100%}main.container{padding:.25rem .75rem 1rem}.navbar .container{gap:.5rem}.navbar-brand{font-size:1rem}.navbar .d-flex{gap:.5rem!important}.user-menu-btn{min-width:auto;max-width:9rem}.item-card{border-radius:.75rem}.item-actions{width:100%;justify-content:stretch!important}.item-action-btn{flex:1 1 0;min-width:0}.mobile-create-buttons,.mobile-tags,.mobile-media{display:flex!important}.mobile-bottom-nav{display:flex!important;position:fixed;left:.75rem;right:.75rem;bottom:.75rem;z-index:1060;background:white;border-radius:1rem;box-shadow:0 .5rem 1.5rem rgba(15,23,42,.18);padding:.35rem}.mobile-bottom-nav .btn{font-size:.8rem;padding:.45rem .25rem}.mobile-tag-picker{display:block!important}.desktop-quick-create{display:none!important}.mobile-create-nav{display:none!important}.desktop-file{display:none!important}.mobile-create-buttons{position:sticky;top:57px;z-index:10;background:#f7f7f4;padding:.35rem 0}.toolbar-filter{display:block;background:#f7f7f4;border-top:4px solid #fff;padding:.35rem .75rem .5rem;box-shadow:0 .4rem .9rem rgba(15,23,42,.05)}.mobile-filter-sidebar{display:none}.filter-panel{background:#f7f7f4;padding:0}.filter-panel-title{display:block;margin:0 0 .3rem!important;font-size:.82rem;color:#64748b;line-height:1}.filter-row{display:grid;grid-template-columns:repeat(5,minmax(0,1fr)) 2.25rem;gap:.25rem;width:100%}.filter-row .btn,.filter-row summary{width:100%;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding-left:.1rem;padding-right:.1rem}.mobile-filter-toggle{position:absolute;opacity:0;pointer-events:none}.mobile-filter-more{grid-column:6;grid-row:1;position:relative;border:0;background:transparent;color:#475569;font-size:1.2rem;line-height:1;text-align:center;cursor:pointer}.mobile-filter-more .badge{position:absolute;top:-.15rem;right:.15rem;font-size:.55rem;line-height:1;padding:.12rem .25rem}.mobile-filter-details{display:none;grid-column:1/-1;grid-row:2;margin-top:.45rem;padding:.75rem;background:white;border-radius:1rem;box-shadow:0 .35rem 1rem rgba(15,23,42,.12)}.mobile-filter-toggle:checked ~ .mobile-filter-details{display:block}.quick-actions{flex-wrap:wrap}.quick-actions .form-control{min-width:100%}.slash-menu{width:calc(100vw - 1.5rem)}.composer-slash-menu{width:100%}textarea.form-control-lg{font-size:1rem}.btn{touch-action:manipulation}.item-row{flex-direction:column}.item-actions{align-self:flex-end}.item-main{width:100%;min-width:0}.copy-item{opacity:.65}}
   </style>
 </head>
 <body>
-<div class="top-toolbar sticky-top"><nav class="navbar bg-white"><div class="container shell"><div class="d-flex align-items-center gap-2 w-100"><a class="small nav-soft fw-semibold" href="/">Start</a>{% if user.is_authenticated %}<a class="small nav-soft" href="{% url 'journal' %}">{% trans "Journal" %}</a><a class="small nav-soft" href="{% url 'team_list' %}">{% trans "Teams" %}</a><div class="dropdown ms-auto"><button class="btn btn-sm btn-outline-secondary dropdown-toggle user-menu-btn" data-bs-toggle="dropdown">{{ user.get_full_name|default:user.username }}</button><ul class="dropdown-menu dropdown-menu-end"><li><a class="dropdown-item" href="{% url 'settings' %}">{% trans "Settings" %}</a></li><li><hr class="dropdown-divider"></li><li><form method="post" action="{% url 'logout' %}">{% csrf_token %}<button class="dropdown-item">{% trans "Logout" %}</button></form></li></ul></div>{% if 'IchWillHeimWebView' in request.META.HTTP_USER_AGENT %}<a class="btn btn-sm btn-outline-danger" href="iwh://close" title="{% trans 'Close' %}" aria-label="{% trans 'Close' %}">×</a>{% endif %}{% else %}<a class="btn btn-sm btn-dark ms-auto" href="{% url 'login' %}">{% trans "Login" %}</a>{% endif %}</div></div></nav>{% block toolbar_filter %}{% endblock %}</div>
+<div class="top-toolbar sticky-top">
+  <nav class="navbar bg-white"><div class="container shell"><div class="d-flex align-items-center gap-2 w-100">
+    <div class="d-none d-md-flex align-items-center gap-2">
+      <a class="small nav-soft fw-semibold" href="/">{% for label in nav_overview_labels %}{{ label }}{% if not forloop.last %} · {% endif %}{% endfor %}</a>
+      {% for link in nav_hidden_links %}<a class="small nav-soft" href="{{ link.url }}">{{ link.label }}</a>{% endfor %}
+      {% if user.is_authenticated %}<a class="small nav-soft" href="{% url 'journal' %}">{% trans "Journal" %}</a><a class="small nav-soft" href="{% url 'kanban_list' %}">{% trans "Kanban" %}</a><a class="small nav-soft" href="{% url 'team_list' %}">{% trans "Teams" %}</a>{% endif %}
+    </div>
+    <div class="d-flex d-md-none align-items-center gap-1"><a class="small nav-soft fw-semibold" href="/">Start</a>{% if user.is_authenticated %}<a class="small nav-soft" href="{% url 'journal' %}">{% trans "Journal" %}</a><a class="small nav-soft" href="{% url 'team_list' %}">{% trans "Teams" %}</a>{% endif %}</div>
+    {% if user.is_authenticated %}
+      <div class="dropdown ms-auto"><button class="btn btn-sm btn-outline-secondary dropdown-toggle user-menu-btn" data-bs-toggle="dropdown">{{ user.get_full_name|default:user.username }}</button><ul class="dropdown-menu dropdown-menu-end"><li><a class="dropdown-item" href="{% url 'settings' %}">{% trans "Settings" %}</a></li><li><button id="pwa-install" type="button" class="dropdown-item d-none">{% trans "Install app" %}</button></li>{% if user.is_staff %}<li><a class="dropdown-item" href="/admin/">Admin</a></li>{% endif %}<li><hr class="dropdown-divider"></li><li><form method="post" action="{% url 'logout' %}">{% csrf_token %}<button class="dropdown-item">{% trans "Logout" %}</button></form></li></ul></div>
+      {% if 'IchWillHeimWebView' in request.META.HTTP_USER_AGENT %}<a class="btn btn-sm btn-outline-danger" href="iwh://close" title="{% trans 'Close' %}" aria-label="{% trans 'Close' %}">×</a>{% endif %}
+    {% else %}<a class="btn btn-sm btn-dark ms-auto" href="{% url 'login' %}">{% trans "Login" %}</a>{% endif %}
+  </div></div></nav>
+  {% block toolbar_filter %}{% endblock %}
+</div>
 <main class="container shell py-4">{% for message in messages %}<div class="alert alert-{{ message.tags|default:'info' }}">{{ message }}</div>{% endfor %}{% block content %}{% endblock %}</main>
 {% if user.is_authenticated and request.resolver_match.url_name == 'index' %}<nav class="mobile-bottom-nav gap-1 d-md-none" aria-label="Mobile navigation"><a class="btn btn-primary flex-fill" href="{% url 'new_item' %}?kind=todo">Aufgabe</a><a class="btn btn-secondary flex-fill" href="{% url 'new_item' %}?kind=note">Notiz</a><a class="btn btn-success flex-fill" href="{% url 'new_item' %}?kind=link">Link</a><a class="btn btn-info flex-fill" href="{% url 'new_item' %}?kind=journal">Journal</a></nav>{% endif %}
 <script>
diff --git a/core/templates/core/index.html b/core/templates/core/index.html
index 960035b..f9a24e8 100644
--- a/core/templates/core/index.html
+++ b/core/templates/core/index.html
@@ -119,10 +119,10 @@
       </div>
       <details class="mobile-tag-picker mb-2"><summary class="btn btn-sm btn-outline-secondary">{% trans "Add tags" %}</summary><div class="mobile-tags flex-wrap gap-2 mt-2">{% for tag in tags %}<button type="button" class="btn btn-sm btn-outline-secondary" @click="addToken('#{{ tag.name|escapejs }}')">#{{ tag.name }}</button>{% endfor %}</div></details>
       {{ form.content }}
-      {% include 'core/_format_toolbar.html' %}
-      <div class="slash-menu list-group shadow" x-show="open" @click.outside="open=false" x-cloak>
+      <div class="slash-menu composer-slash-menu list-group shadow" x-show="open" @click.outside="open=false" x-cloak>
         <template x-for="(cmd, idx) in filtered" :key="cmd.token"><div><div x-show="cmd.group && (idx === 0 || filtered[idx-1].group !== cmd.group)" class="slash-group-header" x-text="cmd.group"></div><button type="button" class="list-group-item list-group-item-action w-100 text-start" :class="{'active': idx === active}" @mouseenter="active=idx" @mousedown.prevent="insert(cmd.token)"><strong x-text="cmd.token"></strong> <span class="text-muted" x-text="cmd.label"></span></button></div></template>
       </div>
+      {% include 'core/_format_toolbar.html' %}
       <div class="d-flex align-items-center gap-2 mt-2 quick-actions">
         <input class="form-control desktop-file" type="file" name="files" multiple accept="image/*,.pdf,.txt,.md" x-ref="fileInput" @change="previewFile($event)">
         <div class="mobile-media gap-2 w-100"><label class="btn btn-outline-secondary flex-fill mb-0">{% trans "Gallery" %}<input class="d-none" type="file" name="files" multiple accept="image/*" @change="previewFile($event)"></label><label class="btn btn-outline-secondary flex-fill mb-0">{% trans "Photo" %}<input class="d-none" type="file" name="files" accept="image/*" capture="environment" @change="previewFile($event)"></label></div>
diff --git a/core/templates/core/item_editor.html b/core/templates/core/item_editor.html
index 6356553..9196561 100644
--- a/core/templates/core/item_editor.html
+++ b/core/templates/core/item_editor.html
@@ -17,10 +17,10 @@
     </div>
     <textarea class="form-control" name="content" rows="18" x-model="text" @keydown="onKeydown($event)" @input="onInput($event)" @paste="handlePaste($event)">{{ item.content }}</textarea>
     <textarea class="form-control" name="comment" rows="5" placeholder="{% trans 'Comment' %}" @keydown="onKeydown($event)" @input="onInput($event)" @paste="handlePaste($event)">{{ item.comment }}</textarea>
-    {% include 'core/_format_toolbar.html' %}
-    <div class="slash-menu list-group shadow" x-show="open" @click.outside="open=false" x-cloak>
+    <div class="slash-menu composer-slash-menu list-group shadow" x-show="open" @click.outside="open=false" x-cloak>
       <template x-for="(cmd, idx) in filtered" :key="cmd.token"><div><div x-show="cmd.group && (idx === 0 || filtered[idx-1].group !== cmd.group)" class="slash-group-header" x-text="cmd.group"></div><button type="button" class="list-group-item list-group-item-action w-100 text-start" :class="{'active': idx === active}" @mouseenter="active=idx" @mousedown.prevent="insert(cmd.token)"><strong x-text="cmd.token"></strong> <span class="text-muted" x-text="cmd.label"></span></button></div></template>
     </div>
+    {% include 'core/_format_toolbar.html' %}
     <div class="row g-2">
       <div class="col-md-4"><select class="form-select" name="visibility"><option value="private" {% if item.visibility == 'private' %}selected{% endif %}>{% trans "Private" %}</option><option value="public" {% if item.visibility == 'public' %}selected{% endif %}>{% trans "Public" %}</option></select></div>
       {% if item.kind == 'todo' %}<div class="col-md-3"><input class="form-control" type="date" name="due_date" value="{{ item.due_at|date:'Y-m-d' }}" title="{% trans 'Due date' %}"></div><div class="col-md-3"><input class="form-control" name="due_time" list="due-times-{{ item.id }}" value="{{ item.due_at|date:'H:i' }}" placeholder="{% trans 'Time optional' %}" title="{% trans 'Time optional' %}"><datalist id="due-times-{{ item.id }}"><option value="00:00"><option value="00:30"><option value="01:00"><option value="01:30"><option value="02:00"><option value="02:30"><option value="03:00"><option value="03:30"><option value="04:00"><option value="04:30"><option value="05:00"><option value="05:30"><option value="06:00"><option value="06:30"><option value="07:00"><option value="07:30"><option value="08:00"><option value="08:30"><option value="09:00"><option value="09:30"><option value="10:00"><option value="10:30"><option value="11:00"><option value="11:30"><option value="12:00"><option value="12:30"><option value="13:00"><option value="13:30"><option value="14:00"><option value="14:30"><option value="15:00"><option value="15:30"><option value="16:00"><option value="16:30"><option value="17:00"><option value="17:30"><option value="18:00"><option value="18:30"><option value="19:00"><option value="19:30"><option value="20:00"><option value="20:30"><option value="21:00"><option value="21:30"><option value="22:00"><option value="22:30"><option value="23:00"><option value="23:30"></datalist></div>{% endif %}
diff --git a/core/templates/core/journal.html b/core/templates/core/journal.html
index 3781fd2..b60e7d7 100644
--- a/core/templates/core/journal.html
+++ b/core/templates/core/journal.html
@@ -28,8 +28,8 @@
       </div>
       <details class="mobile-tag-picker mb-2"><summary class="btn btn-sm btn-outline-secondary">{% trans "Add tags" %}</summary><div class="mobile-tags flex-wrap gap-2 mt-2">{% for tag in tags %}<button type="button" class="btn btn-sm btn-outline-secondary" @click="addToken('#{{ tag.name|escapejs }}')">#{{ tag.name }}</button>{% endfor %}</div></details>
       {{ form.content }}
+      <div class="slash-menu composer-slash-menu list-group shadow" x-show="open" @click.outside="open=false" x-cloak><template x-for="(cmd, idx) in filtered" :key="cmd.token"><div><div x-show="cmd.group && (idx === 0 || filtered[idx-1].group !== cmd.group)" class="slash-group-header" x-text="cmd.group"></div><button type="button" class="list-group-item list-group-item-action w-100 text-start" :class="{'active': idx === active}" @mouseenter="active=idx" @mousedown.prevent="insert(cmd.token)"><strong x-text="cmd.token"></strong> <span class="text-muted" x-text="cmd.label"></span></button></div></template></div>
       {% include 'core/_format_toolbar.html' %}
-      <div class="slash-menu list-group shadow" x-show="open" @click.outside="open=false" x-cloak><template x-for="(cmd, idx) in filtered" :key="cmd.token"><div><div x-show="cmd.group && (idx === 0 || filtered[idx-1].group !== cmd.group)" class="slash-group-header" x-text="cmd.group"></div><button type="button" class="list-group-item list-group-item-action w-100 text-start" :class="{'active': idx === active}" @mouseenter="active=idx" @mousedown.prevent="insert(cmd.token)"><strong x-text="cmd.token"></strong> <span class="text-muted" x-text="cmd.label"></span></button></div></template></div>
       <div class="d-flex align-items-center gap-2 mt-2 quick-actions"><input class="form-control desktop-file" type="file" name="files" multiple accept="image/*,.pdf,.txt,.md" x-ref="fileInput" @change="previewFile($event)"><div class="mobile-media gap-2 w-100"><label class="btn btn-outline-secondary flex-fill mb-0">{% trans "Gallery" %}<input class="d-none" type="file" name="files" multiple accept="image/*" @change="previewFile($event)"></label><label class="btn btn-outline-secondary flex-fill mb-0">{% trans "Photo" %}<input class="d-none" type="file" name="files" accept="image/*" capture="environment" @change="previewFile($event)"></label></div><button class="btn btn-dark px-4">{% trans "Save" %}</button></div>
     </form>
     <div id="items" class="vstack gap-3">
diff --git a/core/templates/core/new_item.html b/core/templates/core/new_item.html
index c1c6ae9..598d298 100644
--- a/core/templates/core/new_item.html
+++ b/core/templates/core/new_item.html
@@ -16,10 +16,10 @@
       </div>
     </div>
     <textarea class="form-control" name="content" rows="14" placeholder="Text … #tag [[  ![[" x-model="text" @keydown="onKeydown($event)" @input="onInput($event)" @paste="handlePaste($event)"></textarea>
-    {% include 'core/_format_toolbar.html' %}
-    <div class="slash-menu list-group shadow" x-show="open" @click.outside="open=false" x-cloak>
+    <div class="slash-menu composer-slash-menu list-group shadow" x-show="open" @click.outside="open=false" x-cloak>
       <template x-for="(cmd, idx) in filtered" :key="cmd.token"><div><div x-show="cmd.group && (idx === 0 || filtered[idx-1].group !== cmd.group)" class="slash-group-header" x-text="cmd.group"></div><button type="button" class="list-group-item list-group-item-action w-100 text-start" :class="{'active': idx === active}" @mouseenter="active=idx" @mousedown.prevent="insert(cmd.token)"><strong x-text="cmd.token"></strong> <span class="text-muted" x-text="cmd.label"></span></button></div></template>
     </div>
+    {% include 'core/_format_toolbar.html' %}
     <div>
       <label class="form-label">{% trans "Add image" %}</label>
       <input class="form-control desktop-file" type="file" name="files" multiple accept="image/*,.pdf,.txt,.md" x-ref="fileInput" @change="previewFile($event)">
diff --git a/core/templates/core/settings.html b/core/templates/core/settings.html
index 506bb57..50660ec 100644
--- a/core/templates/core/settings.html
+++ b/core/templates/core/settings.html
@@ -36,7 +36,7 @@
         <div class="row g-3">
           {% for field in preference_form %}
             {% if field.name == 'language' or field.name == 'default_item_kind' or field.name == 'overview_lines' %}
-              <div class="col-md-4"><label class="form-label">{{ field.label }}</label>{{ field }}</div>
+              <div class="col-12"><label class="form-label">{{ field.label }}</label>{{ field }}</div>
             {% endif %}
           {% endfor %}
           <div class="col-12">
diff --git a/core/tests.py b/core/tests.py
index 6203952..6012052 100644
--- a/core/tests.py
+++ b/core/tests.py
@@ -118,6 +118,35 @@ class FormattingToolbarTests(TestCase):
         self.assertContains(response, "u:'underline'")
 
 
+class NavigationAndLayoutTests(TestCase):
+    def setUp(self):
+        self.user = get_user_model().objects.create_user(username='navigation', password='secret')
+        self.preferences = UserPreference.objects.create(user=self.user)
+        self.client.force_login(self.user)
+
+    def test_desktop_navigation_contains_overview_hidden_links_and_kanban(self):
+        self.preferences.show_notes = False
+        self.preferences.save(update_fields=['show_notes'])
+        response = self.client.get(reverse('index'))
+        self.assertContains(response, 'd-none d-md-flex')
+        self.assertContains(response, f'{reverse("index")}?kind=note')
+        self.assertContains(response, reverse('kanban_list'))
+
+    def test_preference_selects_are_stacked(self):
+        response = self.client.get(reverse('settings'))
+        preferences = response.content.decode().split('id="preferences"', 1)[1].split('name="due_first"', 1)[0]
+        self.assertEqual(preferences.count('<div class="col-12"><label class="form-label">'), 3)
+
+    def test_composer_menu_is_before_toolbar_and_file_controls(self):
+        response = self.client.get(reverse('index'))
+        html = response.content.decode()
+        menu_position = html.index('composer-slash-menu')
+        toolbar_position = html.index('format-toolbar', menu_position)
+        file_position = html.index('desktop-file', toolbar_position)
+        self.assertLess(menu_position, toolbar_position)
+        self.assertLess(toolbar_position, file_position)
+
+
 class CopyButtonTests(TestCase):
     def test_item_has_copy_button_with_original_text(self):
         user = get_user_model().objects.create_user(username='tester', password='secret')
diff --git a/docs/gitea-integration.md b/docs/gitea-integration.md
new file mode 100644
index 0000000..867b713
--- /dev/null
+++ b/docs/gitea-integration.md
@@ -0,0 +1,224 @@
+# Mögliche Erweiterung: Gitea-Integration
+
+## Status
+
+Konzeptvorschlag – noch nicht implementiert.
+
+## Ziel
+
+my2dos soll Issues in einer Gitea-Instanz erstellen können. Die Erfassung erfolgt direkt über einen Slash-Befehl. In einer ersten Version findet keine automatische bidirektionale Synchronisation statt.
+
+## Vorgeschlagene Bedienung
+
+### Issue im Standard-Repository erstellen
+
+```text
+/issue Fehler beim Speichern
+Weitere Beschreibung des Problems.
+```
+
+### Repository über einen Alias auswählen
+
+```text
+/issue my2dos Fehler beim Speichern
+Weitere Beschreibung des Problems.
+```
+
+Dabei könnte `my2dos` beispielsweise auf `rucki/my2dos` verweisen.
+
+### Mögliche spätere Optionen
+
+```text
+/issue my2dos Fehler beim Speichern /labels bug,frontend
+```
+
+Weitere denkbare Angaben:
+
+- Labels
+- zuständige Person
+- Meilenstein
+- Priorität
+- Gitea-Projekt
+
+Die genaue Syntax sollte erst nach Erfahrungen mit der Basisversion festgelegt werden.
+
+## Verhalten der ersten Version
+
+1. Benutzer gibt `/issue` mit Titel und optionaler Beschreibung ein.
+2. my2dos bestimmt das Standard-Repository oder löst den angegebenen Alias auf.
+3. Das Issue wird über die Gitea-REST-API erstellt.
+4. In my2dos wird ein lokaler Link-Eintrag zum Issue angelegt.
+5. Issue-Nummer, Repository und URL werden lokal gespeichert.
+6. Schlägt der API-Aufruf fehl, bleibt der eingegebene Text als lokaler Eintrag erhalten und zeigt einen verständlichen Fehlerstatus.
+
+Der Text darf bei Netzwerk- oder Gitea-Fehlern nicht verloren gehen.
+
+## Einstellungen
+
+In den Benutzereinstellungen könnte ein Bereich **Gitea** ergänzt werden:
+
+- URL der Gitea-Instanz
+- API-Token
+- Standard-Repository
+- optionale Repository-Aliase
+- Verbindung testen
+
+Beispiel für Aliase:
+
+| Alias | Gitea-Repository |
+|---|---|
+| `my2dos` | `rucki/my2dos` |
+| `website` | `rucki/website` |
+
+Später könnten Verbindungen auch einem Team statt nur einem Benutzer gehören.
+
+## Mögliches Datenmodell
+
+### `GiteaConnection`
+
+- Benutzer oder Team
+- Server-URL
+- verschlüsselter API-Token
+- aktiv/inaktiv
+- Erstellungs- und Änderungszeitpunkt
+
+### `GiteaRepository`
+
+- Gitea-Verbindung
+- Alias
+- Owner
+- Repository-Name
+- Kennzeichnung als Standard-Repository
+
+### `ExternalIssue`
+
+- lokaler my2dos-Eintrag
+- Gitea-Repository
+- Issue-Nummer
+- externe URL
+- Synchronisationsstatus
+- letzte Fehlermeldung
+- Zeitpunkt der letzten Synchronisation
+
+Alternativ könnte `ExternalIssue` später zu einem allgemeinen Modell für externe Systeme erweitert werden.
+
+## Gitea-API
+
+Zum Erstellen eines Issues wird voraussichtlich folgender Endpunkt verwendet:
+
+```http
+POST /api/v1/repos/{owner}/{repository}/issues
+Authorization: token <API-TOKEN>
+Content-Type: application/json
+```
+
+Beispielinhalt:
+
+```json
+{
+  "title": "Fehler beim Speichern",
+  "body": "Weitere Beschreibung des Problems."
+}
+```
+
+Die genaue API muss gegen die eingesetzte Gitea-Version geprüft werden.
+
+## Fehlerbehandlung
+
+Zu berücksichtigen sind insbesondere:
+
+- Gitea nicht erreichbar
+- Zeitüberschreitung
+- ungültiger oder abgelaufener Token
+- fehlende Berechtigung für das Repository
+- unbekannter Repository-Alias
+- Repository nicht gefunden
+- ungültige Labels oder Meilensteine
+
+Ein externer API-Aufruf sollte ein kurzes Timeout besitzen. Fehler müssen im lokalen Eintrag nachvollziehbar sein. Für spätere automatische Wiederholungen wäre ein Hintergrundjob sinnvoll.
+
+## Sicherheit
+
+- API-Tokens dürfen nicht im Klartext angezeigt oder protokolliert werden.
+- Tokens sollten verschlüsselt gespeichert oder zunächst über Umgebungsvariablen bereitgestellt werden.
+- Tokens sollten nur die notwendigen Gitea-Berechtigungen besitzen.
+- Benutzerdefinierte Gitea-URLs müssen validiert werden, um SSRF-Zugriffe auf interne Dienste zu verhindern.
+- Für produktive Verbindungen sollte HTTPS verlangt werden.
+- Spätere Webhooks benötigen eine Signatur- oder Secret-Prüfung.
+
+## Zusammenspiel mit Slash-Befehlen
+
+`/issue` ist eine Aktion und nicht zwingend ein neuer Eintragstyp. Zwei Varianten sind möglich:
+
+1. `/issue` erstellt das externe Issue und lokal einen Link-Eintrag.
+2. `/issue` erstellt lokal eine Aufgabe, die mit dem externen Issue verbunden ist.
+
+Für den MVP wird Variante 1 empfohlen, weil der externe Issue-Link das primäre Ergebnis ist. Vor der Implementierung sollte entschieden werden, ob `/issue` – wie die Typbefehle – nur am Anfang eines Eintrags erlaubt ist.
+
+## Tests
+
+Mindestens erforderlich:
+
+- Parser für `/issue`
+- Standard-Repository und Alias-Auflösung
+- Titel und mehrzeilige Beschreibung
+- erfolgreicher API-Aufruf mit gemockter Gitea-API
+- Fehlerantworten und Timeouts
+- kein Verlust des lokalen Textes bei Fehlern
+- Berechtigungsprüfung für Benutzer und Teams
+- sichere Behandlung des Tokens
+- API- und UI-Erstellung
+
+## Ausbaustufen
+
+### Stufe 1: Issues erstellen
+
+- eine Gitea-Verbindung pro Benutzer
+- Standard-Repository
+- `/issue Titel`
+- lokaler Link zum erstellten Issue
+- robuste Fehlerbehandlung
+
+Geschätzter Aufwand: **1–2 Entwicklungstage**.
+
+### Stufe 2: Mehrere Repositories und Labels
+
+- Repository-Aliase
+- Label-Zuordnung
+- Team-Verbindungen
+- Verbindungstest in den Einstellungen
+
+Geschätzter Gesamtaufwand: **3–5 Entwicklungstage**.
+
+### Stufe 3: Bidirektionale Synchronisation
+
+- geschlossenes Gitea-Issue erledigt die lokale Aufgabe
+- erledigte lokale Aufgabe schließt das Gitea-Issue
+- Kommentare synchronisieren
+- Webhooks
+- Schutz vor Synchronisationsschleifen
+
+Geschätzter Aufwand: **1–2 Wochen**.
+
+### Stufe 4: Vollständige Integration
+
+- OAuth statt manueller Tokens
+- mehrere Gitea-Instanzen
+- Hintergrundjobs und automatische Wiederholungen
+- Bearbeiter, Meilensteine und Projekte
+- Konfliktbehandlung
+
+Geschätzter Aufwand: **2–3 Wochen**.
+
+## Empfohlener MVP
+
+1. Gitea-URL, Token und Standard-Repository konfigurierbar machen.
+2. Repository-Aliase unterstützen.
+3. `/issue [alias] Titel` parsen.
+4. Restlichen mehrzeiligen Text als Beschreibung verwenden.
+5. Issue synchron über die Gitea-API erstellen.
+6. Einen lokalen Link-Eintrag mit externer Referenz anlegen.
+7. Bei Fehlern einen lokalen Eintrag mit Wiederholungsmöglichkeit behalten.
+8. Noch keine automatische Synchronisation oder Webhooks implementieren.
+
+Diese Variante liefert schnell einen praktischen Nutzen und hält Sicherheits-, Synchronisations- und Betriebsaufwand zunächst überschaubar.