diff --git a/froide_govplan/templates/froide_govplan/base.html b/froide_govplan/templates/froide_govplan/base.html
index 2149b59..1143585 100644
--- a/froide_govplan/templates/froide_govplan/base.html
+++ b/froide_govplan/templates/froide_govplan/base.html
@@ -78,7 +78,7 @@
     </symbol>
 </svg>
 
-<div class="col-lg-8 mx-auto p-4 py-md-5">
+<div class="col-lg-10 mx-auto p-4 py-md-5">
     <header class="d-flex align-items-center pb-3 mb-5 border-bottom">
         <a href="/" class="d-flex align-items-center text-body-emphasis text-decoration-none text-reset">
             <svg class="bi me-2" width="40" height="32">
diff --git a/froide_govplan/templates/froide_govplan/detail.html b/froide_govplan/templates/froide_govplan/detail.html
index 75d4478..07709c4 100644
--- a/froide_govplan/templates/froide_govplan/detail.html
+++ b/froide_govplan/templates/froide_govplan/detail.html
@@ -25,47 +25,17 @@
                 {% for cat in object.categories.all %}
                     <li>
                         <a href="{{ section.get_absolute_url }}"
-                           class="badge text-bg-light-subtle me-2">{{ cat.name }}</a>
+                           class="badge text-bg-light text-decoration-none">{{ cat.name }}</a>
                     </li>
                 {% endfor %}
             </ul>
         </div>
-        <dl>
-            {% if object.quote %}
-                <dt>Ausschnitt aus dem Koalitionsvertrag</dt>
-                <dd>
-                    <blockquote>
-                        {{ object.quote | addquotes | markdown }}
-                    </blockquote>
-                    {% with refs=object.get_reference_links %}
-                        {% if refs %}
-                            <p>
-                                <span class="small">
-                                    {% if refs|length > 1 %}
-                                        Quellen:
-                                    {% else %}
-                                        Quelle:
-                                    {% endif %}
-                                </span>
-                                {% for ref in refs %}
-                                    <a href="{{ ref }}" class="badge text-bg-light me-2" target="_blank">{{ forloop.counter }}</a>
-                                {% endfor %}
-                            </p>
-                        {% endif %}
-                    {% endwith %}
-                {% endif %}
-            </dd>
-            {% if object.description %}
-                <div class="mt-3 mt-md-5">
-                    <dt>Unsere Einschätzung</dt>
-                    <dd>
-                        {{ object.description | safe }}
-                    </dd>
-                </div>
-            {% endif %}
-        </dl>
-        <div class="row">
-            <div class="col col-12 col-md-5 col-lg-3 mt-3 mt-md-0">
+
+        <div>
+            <div class="row">
+              <!-- Linke Spalte: Desktop: ca. 33% -->
+              <div class="col-12 col-md-4 order-md-1 order-2">
+
                 <dl>
                     {% if object.rating %}
                         <dt>Bewertung</dt>
@@ -88,13 +58,14 @@
                     {% if object.responsible_publicbody %}
                         <dt>Federführung</dt>
                         <dd>
-                            <a href="{{ object.responsible_publicbody.get_absolute_url }}">{{ object.responsible_publicbody.name }}</a>
+                            <a href="#" class="text-decoration-none">{{ object.responsible_publicbody.name }}</a>
                         </dd>
                     {% endif %}
+                    <br>
                     {% if object.responsible_publicbody %}
                         {% if not object.has_recent_foirequest and government.active %}
                             <p>
-                                <a href="{{ object.make_request_url }}"
+                                <a href="#"
                                    target="_blank"
                                    class="btn btn-outline-primary btn-sm">Anfrage zum Vorhaben stellen</a>
                             </p>
@@ -129,8 +100,50 @@
                         </dd>
                     {% endif %}
                 </dl>
+
+            </div>
+              <!-- Rechte Spalte: Desktop: ca. 67% -->
+              <div class="col-12 col-md-8 order-md-2 order-1">
+
+                <dl>
+                    {% if object.quote %}
+                        <dt>Ausschnitt aus dem Verwaltungsvorhaben</dt>
+                        <dd>
+                            <blockquote>
+                                {{ object.quote | addquotes | markdown }}
+                            </blockquote>
+                            {% with refs=object.get_reference_links %}
+                                {% if refs %}
+                                    <p>
+                                        <span class="small">
+                                            {% if refs|length > 1 %}
+                                                Quellen:
+                                            {% else %}
+                                                Quelle:
+                                            {% endif %}
+                                        </span>
+                                        {% for ref in refs %}
+                                            <a href="{{ ref }}" class="badge text-bg-light me-2" target="_blank">{{ forloop.counter }}</a>
+                                        {% endfor %}
+                                    </p>
+                                {% endif %}
+                            {% endwith %}
+                        {% endif %}
+                    </dd>
+                    {% if object.description %}
+                        <div class="mt-3 mt-md-5">
+                            <dt>Unsere Einschätzung</dt>
+                            <dd>
+                                {{ object.description | safe }}
+                            </dd>
+                        </div>
+                    {% endif %}
+                </dl>
+
+                </div>
             </div>
         </div>
+
     </p>
 
     <div class="row align-items-md-stretch">
diff --git a/froide_govplan/templates/helper/admin/fk_filter.html b/froide_govplan/templates/helper/admin/fk_filter.html
new file mode 100644
index 0000000..45a8251
--- /dev/null
+++ b/froide_govplan/templates/helper/admin/fk_filter.html
@@ -0,0 +1,13 @@
+{% load i18n %}
+<h3>{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
+<ul>
+    <li>
+        <form action="" method="get">
+            <input type="text"
+                   name="{{ choices.0.field_path }}"
+                   value="{% if choices.0.value %}{{ choices.0.value }}{% endif %}">
+            {% for k, v in choices.0.params.items %}<input type="hidden" name="{{ k }}" value="{{ v }}" />{% endfor %}
+        </form>
+    </li>
+</ul>
+
diff --git a/froide_govplan/templates/helper/forms/widgets/tag_autocomplete.html b/froide_govplan/templates/helper/forms/widgets/tag_autocomplete.html
new file mode 100644
index 0000000..e1b9caf
--- /dev/null
+++ b/froide_govplan/templates/helper/forms/widgets/tag_autocomplete.html
@@ -0,0 +1,18 @@
+{% load i18n %}
+{% load frontendbuild %}
+<div style="display: none">{% include "django/forms/widgets/input.html" %}</div>
+<select class="tagautocomplete"
+        data-additemtext="{% trans 'Press Enter to add <b>${value}</b>' %}"
+        data-uniqueitemtext="{% trans 'This tag is already set.' %}"
+        data-loading="{% trans 'Searching…' %}"
+        data-noresults="{% trans 'No results' %}"
+        data-nochoices="{% trans 'No results' %}"
+        data-itemselect="{% trans 'Press to select' %}"
+        data-allownew="{% if allow_new %}true{% else %}false{% endif %}"
+        data-queryparam="{{ query_param }}"
+        {% if max_item_count %}data-maxitemcount="{{ max_item_count }}"{% endif %}
+        id="{{ widget.attrs.id }}_select"
+        {% if max_item_count != 1 %}multiple{% endif %}>
+    {% for value in values %}<option value="{{ value.value }}" selected>{{ value.label }}</option>{% endfor %}
+</select>
+