diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 3e98777cc..63651cccc 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -5,4 +5,7 @@
 # Format html files with djlint
 3698b97c143c773639dd0e75617cd8d8fb034131
 # Format with prettier
-43bc670f81530fa7f62d1e4f5c1b5f8c8edbb92a
\ No newline at end of file
+43bc670f81530fa7f62d1e4f5c1b5f8c8edbb92a
+# revert/bring back request flow
+2bd30cb88398f0f2a02190d81ceeb129dbe0808c
+9483cfdeb3e6b3a036b460c78d9da074f16a020a
\ No newline at end of file
diff --git a/froide/foirequest/templates/foirequest/request.html b/froide/foirequest/templates/foirequest/request.html
index 99e684331..58fc70472 100644
--- a/froide/foirequest/templates/foirequest/request.html
+++ b/froide/foirequest/templates/foirequest/request.html
@@ -61,18 +61,16 @@
         <template data-slot="campaigns">
             {% for campaign in campaigns %}
                 <div class="col-12 col-sm-6 col-md-4 mb-4">
-                    <div class="card h-100">
-                        <div class="card-body d-flex flex-column">
-                            {% if campaign.logo %}
-                                <img src="{{ campaign.logo.url }}"
-                                     alt=""
-                                     class="campaign-logo d-block object-fit-contain w-100 mb-3" />
-                            {% endif %}
-                            <h2 class="fs-4">{% blocktrans with name=campaign.name %}Participate in {{ name }}{% endblocktrans %}</h2>
-                            {% if campaign.short_description %}<div class="fs-6">{{ campaign.short_description|markdown }}</div>{% endif %}
-                            <div class="mt-auto">
-                                <a href="{{ campaign.url }}" class="btn btn-primary w-100">{% trans "Make a request" %}</a>
-                            </div>
+                    <div class="d-flex flex-column border border-2 border-light h-100 p-3">
+                        {% if campaign.logo %}
+                            <img src="{{ campaign.logo.url }}"
+                                 alt=""
+                                 class="campaign-logo d-block object-fit-contain w-100 mb-3" />
+                        {% endif %}
+                        <h2 class="h5">{% blocktrans with name=campaign.name %}Participate in {{ name }}{% endblocktrans %}</h2>
+                        {% if campaign.short_description %}<div class="fs-6">{{ campaign.short_description|markdown }}</div>{% endif %}
+                        <div class="mt-auto">
+                            <a href="{{ campaign.url }}" class="btn btn-outline-primary w-100">{% trans "Make a request" %}</a>
                         </div>
                     </div>
                 </div>
@@ -88,9 +86,7 @@ <h2>{% blocktrans %}Choose public body{% endblocktrans %}</h2>
             {% include "foirequest/snippets/request_publicbody_search_hint.html" %}
         </template>
         <template data-slot="publicbody-help-text">
-            <p>
-                {% blocktrans %}Which public body do you want to request information at? Here you can search and filter all available public bodies.{% endblocktrans %}
-            </p>
+            {% include "foirequest/snippets/request_publicbody_helptext.html" %}
         </template>
         <template data-slot="publicbody-missing">
             <h3 class="fs-6">{% trans "Can’t find a specific public body?" %}</h3>
diff --git a/froide/foirequest/templates/foirequest/snippets/request_hints.html b/froide/foirequest/templates/foirequest/snippets/request_hints.html
index 69d867f28..a90ab100d 100644
--- a/froide/foirequest/templates/foirequest/snippets/request_hints.html
+++ b/froide/foirequest/templates/foirequest/snippets/request_hints.html
@@ -11,14 +11,7 @@ <h3 class="h6">{% blocktrans %}Important Notes:{% endblocktrans %}</h3>
         {% blocktrans %}Keep it <strong>focused and concise</strong>.{% endblocktrans %}
     </li>
     <li>
-        {% blocktrans %}This site is <strong>public</strong>. Everything you type and any response will be published.{% endblocktrans %}
+        {% blocktrans %}Do <strong>not include or ask for</strong> personal information in your request.{% endblocktrans %}
     </li>
-    <li>
-        {% blocktrans %}Do <strong>not include</strong> personal information in your request.{% endblocktrans %}
-    </li>
-    <li>
-        {% blocktrans %}Do <strong>not ask</strong> for personal information.{% endblocktrans %}
-    </li>
-    <li>{% blocktrans %}Please use proper spelling.{% endblocktrans %}</li>
-    <li>{% blocktrans %}Please stay polite.{% endblocktrans %}</li>
+    <li>{% blocktrans %}Please use proper spelling and stay polite.{% endblocktrans %}</li>
 </ul>
diff --git a/froide/foirequest/templates/foirequest/snippets/request_publicbody_helptext.html b/froide/foirequest/templates/foirequest/snippets/request_publicbody_helptext.html
new file mode 100644
index 000000000..5fd13edc0
--- /dev/null
+++ b/froide/foirequest/templates/foirequest/snippets/request_publicbody_helptext.html
@@ -0,0 +1,4 @@
+{% load i18n %}
+<p>
+    {% blocktrans %}Which public body do you want to request information at? Here you can search and filter all available public bodies.{% endblocktrans %}
+</p>
diff --git a/froide/foirequest/views/make_request.py b/froide/foirequest/views/make_request.py
index 21cf58c49..4965ffc12 100644
--- a/froide/foirequest/views/make_request.py
+++ b/froide/foirequest/views/make_request.py
@@ -81,12 +81,12 @@ class MakeRequestView(FormView):
     form_class = RequestForm
     template_name = "foirequest/request.html"
     FORM_CONFIG_PARAMS = (
-        "hide_similar",
-        "hide_public",
-        "hide_draft",
-        "hide_publicbody",
-        "hide_full_text",
-        "hide_editing",
+        "hide_similar",  # hide similar request search
+        "hide_public",  # hide option to make request non-public
+        "hide_draft",  # hide button to save request as draft
+        "hide_publicbody",  # hide option to change public body. use on public-body specific request url
+        "hide_full_text",  # hide option to edit the request boilerplate text
+        "hide_editing",  # hide step to write request text. use together with body param
     )
 
     draft = None
@@ -404,13 +404,9 @@ def get_js_context(self):
                 "notSentToPb": _("(not sent to public body)"),
                 "terms": _("Terms of Use"),
                 "searchToPbName": _("to %(name)s") % {"name": "${name}"},
-                "searchToProject": _(
-                    'to <a href="%(url)s">%(name)s</a> and <a href="%(urlp)s">%(count)s other public bodies</a>'
-                )
+                "searchToProject": _("to %(name)s and %(count)s other public bodies")
                 % {
                     "name": "${name}",
-                    "url": "${url}",
-                    "urlp": "${urlp}",
                     "count": "${count}",
                 },
                 "notYetSet": _("Not yet set"),
@@ -419,10 +415,12 @@ def get_js_context(self):
                 "dateRangeFrom": _("From"),
                 "dateRangeTo": _("Until"),
                 "campaign": _("Campaign"),
+                "noCampaign": _("No campaign"),
                 "toggleCollapse": _("Toggle collapse"),
                 "searchText": pgettext("Search input", "Text"),
                 "login": pgettext("Make request", "Log in"),
                 "searchRequests": _("Search requests"),
+                "showEntireMessage": _("Show entire message"),
             },
             "regex": {
                 "greetings": [_("Dear Sir or Madam")],
@@ -792,9 +790,9 @@ def get_context_data(self, **kwargs):
         if self.request.GET.get("single") is not None:
             is_multi = False
 
-        # skip "i confirm" nag heuristically for all who can multi-request
-        # TODO: find better heuristic for "trusted users"?
-        confirm_required = not is_multi
+        # skip "i confirm this is a foi request" for users who can multi-request
+        # or if editing is hidden (less friction for pre-written requests)
+        confirm_required = not (config.get("hide_editing") or is_multi)
 
         campaigns = Campaign.objects.get_active()
 
diff --git a/froide/tests/live/test_request.py b/froide/tests/live/test_request.py
index 2903dc876..7f281c8f1 100644
--- a/froide/tests/live/test_request.py
+++ b/froide/tests/live/test_request.py
@@ -6,7 +6,7 @@
 from django.utils import timezone
 
 import pytest
-from playwright.async_api import expect
+from playwright.async_api import Page, expect
 
 from froide.foirequest.models import FoiRequest, RequestDraft
 from froide.foirequest.tests import factories
@@ -16,10 +16,15 @@
 
 User = get_user_model()
 
+req_title = "FoiRequest Number"
+req_body = "Documents describing & something..."
+
 
 @pytest.mark.django_db
 @pytest.mark.asyncio(loop_scope="session")
-async def test_make_not_logged_in_request(page, live_server, public_body_with_index):
+async def test_make_not_logged_in_request(
+    page: Page, live_server, public_body_with_index
+):
     pb = PublicBody.objects.all().first()
     await go_to_make_request_url(page, live_server)
     await page.locator("request-page .btn-primary >> nth=0").click()
@@ -40,9 +45,8 @@ async def test_make_not_logged_in_request(page, live_server, public_body_with_in
     await page.locator("[name=terms]").click()
     await page.locator("#step_create_account .btn-primary").click()
 
-    req_title = "FoiRequest Number"
     await page.fill("[name=subject]", req_title)
-    await page.fill("[name=body]", "Documents describing something...")
+    await page.fill("[name=body]", req_body)
     await page.locator("[name=confirm]").click()
     await page.locator("#step_write_request .btn-primary").click()
 
@@ -50,16 +54,7 @@ async def test_make_not_logged_in_request(page, live_server, public_body_with_in
 
     await page.locator("#send-request-button").click()
 
-    new_account_url = reverse("account-new")
-
-    # FIXME
-    await page.wait_for_timeout(1000)
-    # none of these worked, unexpectedly:
-    # await page.wait_for_url('*'+new_account-url+'*')
-    # await page.wait_for_url('*')
-    # await page.wait_for_load_state()
-
-    assert new_account_url in page.url
+    await page.wait_for_url(f"**{reverse('account-new')}*")
 
     new_user = User.objects.get(email=user_email)
     assert not new_user.private
@@ -68,6 +63,8 @@ async def test_make_not_logged_in_request(page, live_server, public_body_with_in
     assert req.public
     assert req.public_body == pb
     assert req.status == FoiRequest.STATUS.AWAITING_USER_CONFIRMATION
+    assert req.description == req_body
+    assert req_body in req.messages[0].plaintext
     message = mail.outbox[0]
     match = re.search(r"http://[^/]+(/.+)", message.body)
     activate_url = match.group(1)
@@ -83,14 +80,15 @@ async def test_make_not_logged_in_request(page, live_server, public_body_with_in
 
 @pytest.mark.django_db
 @pytest.mark.asyncio(loop_scope="session")
-async def test_make_not_logged_in_request_to_public_body(page, live_server, world):
+async def test_make_not_logged_in_request_to_public_body(
+    page: Page, live_server, world
+):
     pb = PublicBody.objects.all().first()
     assert pb
     await go_to_make_request_url(page, live_server, pb=pb)
 
-    req_title = "FoiRequest Number"
     await page.fill("[name=subject]", req_title)
-    await page.fill("[name=body]", "Documents describing something...")
+    await page.fill("[name=body]", req_body)
     await page.locator("[name=confirm]").click()
     await page.locator("#step_write_request .btn-primary").click()
 
@@ -110,9 +108,8 @@ async def test_make_not_logged_in_request_to_public_body(page, live_server, worl
 
     await page.locator("#send-request-button").click()
 
-    new_account_url = reverse("account-new")
-    await page.wait_for_timeout(1000)
-    assert new_account_url in page.url
+    await page.wait_for_url(f"**{reverse('account-new')}*")
+
     new_user = User.objects.get(email=user_email)
     assert new_user.first_name == user_first_name
     assert new_user.last_name == user_last_name
@@ -122,6 +119,8 @@ async def test_make_not_logged_in_request_to_public_body(page, live_server, worl
     assert req.public
     assert req.public_body == pb
     assert req.status == FoiRequest.STATUS.AWAITING_USER_CONFIRMATION
+    assert req.description == req_body
+    assert req_body in req.messages[0].plaintext
 
 
 @pytest.mark.django_db
@@ -140,23 +139,21 @@ async def test_make_logged_in_request(
     await expect(buttons).to_have_count(2)
     await page.locator(".search-results .search-result .btn >> nth=0").click()
 
-    req_title = "FoiRequest Number"
-    body_text = "Documents describing & something..."
     await page.fill("[name=subject]", req_title)
-    await page.fill("[name=body]", body_text)
+    await page.fill("[name=body]", req_body)
     await page.locator("[name=confirm]").click()
     await page.locator("#step_write_request .btn-primary").click()
 
     await page.locator("#step_request_public .btn-primary").click()
 
     await page.locator("#send-request-button").click()
-    request_sent = reverse("foirequest-request_sent")
-    await page.wait_for_timeout(1000)
-    assert request_sent in page.url
+
+    await page.wait_for_url(f"**{reverse('foirequest-request_sent')}*")
+
     req = FoiRequest.objects.filter(user=dummy_user).order_by("-id")[0]
     assert req.title == req_title
-    assert req.description in body_text
-    assert body_text, req.messages[0].plaintext
+    assert req.description == req_body
+    assert req_body in req.messages[0].plaintext
     assert req.public
     assert req.public_body == pb
     assert req.status == "awaiting_response"
@@ -165,7 +162,7 @@ async def test_make_logged_in_request(
 @pytest.mark.django_db
 @pytest.mark.asyncio(loop_scope="session")
 async def test_make_logged_in_request_too_many(
-    page,
+    page: Page,
     live_server,
     foi_request_factory,
     foi_message_factory,
@@ -183,34 +180,32 @@ async def test_make_logged_in_request_too_many(
     pb = PublicBody.objects.all().first()
     await go_to_make_request_url(page, live_server, pb=pb)
 
-    req_title = "FoiRequest Number"
-    body_text = "Documents describing & something..."
     await page.fill("[name=subject]", req_title)
-    await page.fill("[name=body]", body_text)
+    await page.fill("[name=body]", req_body)
     await page.locator("[name=confirm]").click()
     await page.locator("#step_write_request .btn-primary").click()
 
     await page.locator("#step_request_public .btn-primary").click()
     await page.locator("#send-request-button").click()
-    make_request = reverse("foirequest-make_request")
-    await page.wait_for_timeout(1000)
-    assert make_request in page.url
+
+    await page.wait_for_load_state()
+
     alert = page.locator(".alert-danger", has_text="exceeded your request limit")
     await expect(alert).to_be_visible()
 
 
 @pytest.mark.django_db
 @pytest.mark.asyncio(loop_scope="session")
-async def test_make_request_logged_out_with_existing_account(page, live_server, world):
+async def test_make_request_logged_out_with_existing_account(
+    page: Page, live_server, world
+):
     pb = PublicBody.objects.all().first()
     user = User.objects.get(username="dummy")
     await go_to_make_request_url(page, live_server, pb=pb)
-    req_title = "FoiRequest Number"
-    body_text = "Documents describing & something..."
     user_first_name = user.first_name
     user_last_name = user.last_name
     await page.fill("[name=subject]", req_title)
-    await page.fill("[name=body]", body_text)
+    await page.fill("[name=body]", req_body)
     await page.locator("[name=confirm]").click()
     await page.locator("#step_write_request .btn-primary").click()
 
@@ -230,9 +225,7 @@ async def test_make_request_logged_out_with_existing_account(page, live_server,
     draft_count = RequestDraft.objects.filter(user=None).count()
     await page.locator("#send-request-button").click()
 
-    new_account_url = reverse("account-new")
-    await page.wait_for_timeout(1000)
-    assert new_account_url in page.url
+    await page.wait_for_url(f"**{reverse('account-new')}*")
 
     new_count = FoiRequest.objects.filter(user=user).count()
     assert old_count == new_count
@@ -246,13 +239,86 @@ async def test_make_request_logged_out_with_existing_account(page, live_server,
 
 @pytest.mark.django_db
 @pytest.mark.asyncio(loop_scope="session")
-async def test_collapsed_menu(page, live_server):
-    SCREEN_SIZE = (400, 800)
-    await page.set_viewport_size({"width": SCREEN_SIZE[0], "height": SCREEN_SIZE[1]})
-    await page.goto(live_server.url + reverse("index"))
-    await expect(page.locator(".navbar form[role=search]")).not_to_be_visible()
-    await page.locator(".navbar-toggler").click()
-    await expect(page.locator(".navbar form[role=search]")).to_be_visible()
+async def test_edit_request_boilerplate(
+    page: Page, live_server, public_body_with_index, dummy_user
+):
+    pb = PublicBody.objects.all().first()
+    await do_login(page, live_server)
+    await go_to_make_request_url(page, live_server)
+
+    await page.get_by_role("checkbox", name="Skip this part next time and").check()
+    await page.get_by_role("button", name="Skip").click()
+
+    await page.locator(".search-public_bodies").fill(pb.name)
+    await page.get_by_role("button", name="Search").click()
+    await page.get_by_role("link", name="Make request").first.click()
+    await page.get_by_role("textbox", name="Subject:").fill(req_title)
+
+    await page.get_by_role("checkbox", name="Don't wrap in template").check()
+
+    body = page.get_by_role("textbox", name="Request body:")
+    initial_template = await body.input_value()
+    assert initial_template
+
+    await body.fill(req_body)
+
+    await page.get_by_role("checkbox", name="I confirm that I am not").check()
+    await page.get_by_role("button", name="Next").click()
+
+    await (
+        page.locator("#step_request_public").get_by_role("button", name="Next").click()
+    )
+    await page.get_by_role("button", name="Submit request").click()
+
+    await page.wait_for_url(f"**{reverse('foirequest-request_sent')}*")
+
+    req = FoiRequest.objects.filter(user=dummy_user).order_by("-id")[0]
+    assert req.title == req_title
+    assert req.description in req_body
+    assert all(
+        line.strip() not in req.messages[0].plaintext
+        for line in initial_template.split("\n")
+        if line.strip()
+    )
+
+
+@pytest.mark.django_db
+@pytest.mark.asyncio(loop_scope="session")
+async def test_skip_search_similar(
+    page: Page, live_server, world, public_body_with_index
+):
+    pb = PublicBody.objects.all().first()
+    await do_login(page, live_server)
+    await go_to_make_request_url(page, live_server)
+
+    await page.get_by_role("checkbox", name="Skip this part next time and").check()
+    await page.get_by_role("button", name="Skip").click()
+
+    await page.locator(".search-public_bodies").fill(pb.name)
+    await page.get_by_role("button", name="Search").click()
+    await page.get_by_role("link", name="Make request").first.click()
+    await page.get_by_role("textbox", name="Subject:").fill(req_title)
+    await page.get_by_role("textbox", name="Request body:").fill(req_body)
+    await page.get_by_role("checkbox", name="I confirm that I am not").check()
+    await page.get_by_role("button", name="Next").click()
+
+    await (
+        page.locator("#step_request_public").get_by_role("button", name="Next").click()
+    )
+    await page.get_by_role("button", name="Submit request").click()
+
+    await page.wait_for_url(f"**{reverse('foirequest-request_sent')}*")
+
+    await go_to_make_request_url(page, live_server)
+
+    await page.get_by_role("heading", name="Choose public body").click()
+
+    await expect(page.get_by_role("heading", name="Choose public body")).to_be_visible()
+
+    await page.get_by_role("link", name="Similar requests").click()
+    await expect(
+        page.get_by_role("checkbox", name="Skip this part next time and")
+    ).to_be_checked()
 
 
 @pytest.mark.django_db
diff --git a/frontend/images/make-request/step-find-publicbody.avif b/frontend/images/make-request/step-find-publicbody.avif
new file mode 100644
index 000000000..1ec14a880
Binary files /dev/null and b/frontend/images/make-request/step-find-publicbody.avif differ
diff --git a/frontend/images/make-request/step-find-similar.avif b/frontend/images/make-request/step-find-similar.avif
new file mode 100644
index 000000000..1fa25f8eb
Binary files /dev/null and b/frontend/images/make-request/step-find-similar.avif differ
diff --git a/frontend/javascript/components/makerequest/intro-campaigns.vue b/frontend/javascript/components/makerequest/intro-campaigns.vue
index 55ec3eb60..84c69f453 100644
--- a/frontend/javascript/components/makerequest/intro-campaigns.vue
+++ b/frontend/javascript/components/makerequest/intro-campaigns.vue
@@ -2,23 +2,21 @@
   <div>
     <div class="row">
       <!-- col-12 is slightly akward on medium viewports but will make sure it is front and center -->
-      <div class="col-12 col-md-4 mb-4">
-        <div class="card h-100">
-          <div class="card-body d-flex flex-column">
-            <slot name="campaign_main"></slot>
-            <div class="mt-auto">
-              <button
-                type="button"
-                class="btn btn-primary w-100"
-                @click="emit('stepNext')"
-              >
-                {{ i18n.makeRequest }}
-              </button>
-            </div>
+      <div class="col-12 col-md-4 mb-4 d-flex">
+        <div class="d-flex flex-column border border-2 border-light h-100 p-3">
+          <slot name="campaign_main" />
+          <div class="mt-auto">
+            <button
+              type="button"
+              class="btn btn-primary w-100"
+              @click="emit('stepNext')"
+            >
+              {{ i18n.makeRequest }}
+            </button>
           </div>
         </div>
       </div>
-      <slot name="campaigns"></slot>
+      <slot name="campaigns" />
     </div>
   </div>
 </template>
@@ -37,3 +35,13 @@ defineProps({
 
 const emit = defineEmits('stepNext')
 </script>
+
+<style lang="scss" scoped>
+:deep(.campaign-logo) {
+  max-height: 6em;
+}
+
+:deep(ul) {
+  padding-left: 1rem;
+}
+</style>
diff --git a/frontend/javascript/components/makerequest/request-form.vue b/frontend/javascript/components/makerequest/request-form.vue
index de66ccf49..0c3406dee 100644
--- a/frontend/javascript/components/makerequest/request-form.vue
+++ b/frontend/javascript/components/makerequest/request-form.vue
@@ -9,359 +9,345 @@
     />
     <input type="hidden" name="law_type" :value="lawType" />
 
-    <div class="card mb-3">
-      <div class="card-body">
-        <div class="row mb-3" v-if="!hidePublicbodyChooser">
-          <div class="col-sm-3 d-flex align-items-center">
-            {{ i18n.recipientPb }}
-          </div>
-          <div class="col-sm-9 d-flex align-items-center">
-            <strong v-if="publicBodies.length === 0" class="text-danger">{{
-              i18n.none
-            }}</strong>
-            <strong v-else>{{
-              publicBodies.map((pb) => pb.name).join(', ')
-            }}</strong>
-            <!-- setStep won't work in froide-campaign, but hidePublicbodyChooser always applies there;
+    <div class="border border-2 border-gray-300 p-3 mb-3">
+      <div class="row mb-3" v-if="!hidePublicbodyChooser">
+        <div class="col-sm-3 d-flex align-items-center">
+          {{ i18n.recipientPb }}
+        </div>
+        <div class="col-sm-9 d-flex align-items-center">
+          <strong v-if="publicBodies.length === 0" class="text-danger">{{
+            i18n.none
+          }}</strong>
+          <strong v-else>{{
+            publicBodies.map((pb) => pb.name).join(', ')
+          }}</strong>
+          <!-- setStep won't work in froide-campaign, but hidePublicbodyChooser always applies there;
               and Pb choosing is handled by <CampaignChoosePublicbody> -->
+          <button
+            type="button"
+            class="btn btn-secondary btn-sm ms-auto text-nowrap"
+            @click="setStepChangePublicbody"
+          >
+            {{ i18n.change }}
+          </button>
+        </div>
+      </div>
+
+      <div class="row mb-3">
+        <div class="col-sm-3 d-flex align-items-center">
+          <label
+            class="form-check-label"
+            for="id_subject"
+            :class="{
+              'text-danger': errors.subject && !subjectChanged
+            }"
+          >
+            {{ i18n.subject }}:
+          </label>
+        </div>
+        <div class="col-sm-9 d-flex flex-wrap align-items-center">
+          <template
+            v-if="
+              editingDisabled && !(errors.subject && errors.subject.length > 0)
+            "
+          >
+            <!-- editingDisabled e.g. when ?hide_editing=1 -->
+            <input type="hidden" name="subject" :value="subject" />
+            <strong>{{ subject }}</strong>
             <button
               type="button"
               class="btn btn-secondary btn-sm ms-auto text-nowrap"
-              @click="setStepChangePublicbody"
+              @click="enableEditing"
             >
-              {{ i18n.change }}
+              {{ i18n.reviewEdit }}
             </button>
-          </div>
-        </div>
-
-        <div class="row mb-3">
-          <div class="col-sm-3 d-flex align-items-center">
-            <label
-              class="form-check-label"
-              for="id_subject"
+          </template>
+          <template v-else>
+            <div
+              v-if="
+                !clearFormErrors && errors.subject && errors.subject.length > 0
+              "
+              class="alert my-2 w-100"
               :class="{
-                'text-danger': errors.subject && !subjectChanged
+                'alert-danger': !subjectChanged,
+                'alert-warning': subjectChanged
               }"
             >
-              {{ i18n.subject }}:
-            </label>
-          </div>
-          <div class="col-sm-9 d-flex flex-wrap align-items-center">
-            <template
-              v-if="
-                editingDisabled &&
-                !(errors.subject && errors.subject.length > 0)
-              "
+              <ul class="list-unstyled my-0">
+                <li v-for="error in errors.subject" :key="error.message">
+                  {{ error.message }}
+                </li>
+              </ul>
+            </div>
+            <div
+              v-else-if="subjectValidationErrors.length > 0"
+              class="alert my-2 w-100"
+              :class="{
+                'alert-danger': !subjectChanged,
+                'alert-warning': subjectChanged
+              }"
             >
-              <!-- editingDisabled e.g. when ?hide_editing=1 -->
-              <input type="hidden" name="subject" :value="subject" />
-              <strong>{{ subject }}</strong>
-              <button
-                type="button"
-                class="btn btn-secondary btn-sm ms-auto text-nowrap"
-                @click="enableEditing"
-              >
-                {{ i18n.reviewEdit }}
-              </button>
-            </template>
-            <template v-else>
-              <div
-                v-if="
-                  !clearFormErrors &&
-                  errors.subject &&
-                  errors.subject.length > 0
-                "
-                class="alert my-2 w-100"
-                :class="{
-                  'alert-danger': !subjectChanged,
-                  'alert-warning': subjectChanged
-                }"
-              >
-                <ul class="list-unstyled my-0">
-                  <li v-for="error in errors.subject" :key="error.message">
-                    {{ error.message }}
-                  </li>
-                </ul>
-              </div>
-              <div
-                v-else-if="subjectValidationErrors.length > 0"
-                class="alert my-2 w-100"
-                :class="{
-                  'alert-danger': !subjectChanged,
-                  'alert-warning': subjectChanged
-                }"
-              >
-                <ul class="list-unstyled my-0">
-                  <li v-for="error in subjectValidationErrors" :key="error">
-                    {{ error }}
-                  </li>
-                </ul>
-              </div>
-              <input
-                v-model="subject"
-                ref="subject"
-                id="id_subject"
-                type="text"
-                name="subject"
-                class="form-control"
-                :minlength="formFields.subject.min_length"
-                :maxlength="formFields.subject.max_length"
-                :class="{
-                  'is-invalid':
-                    (errors.subject || subjectValid === false) &&
-                    !subjectChanged
-                }"
-                :placeholder="formFields.subject.placeholder"
-                @change="updateSubjectChanged(true)"
-                @keyup="resetSubjectCustomValidity"
-                @keydown.enter.prevent
-              />
-            </template>
-          </div>
+              <ul class="list-unstyled my-0">
+                <li v-for="error in subjectValidationErrors" :key="error">
+                  {{ error }}
+                </li>
+              </ul>
+            </div>
+            <input
+              v-model="subject"
+              ref="subject"
+              id="id_subject"
+              type="text"
+              name="subject"
+              class="form-control"
+              :minlength="formFields.subject.min_length"
+              :maxlength="formFields.subject.max_length"
+              :class="{
+                'is-invalid':
+                  (errors.subject || subjectValid === false) && !subjectChanged
+              }"
+              :placeholder="formFields.subject.placeholder"
+              @change="updateSubjectChanged(true)"
+              @keyup="resetSubjectCustomValidity"
+              @keydown.enter.prevent
+            />
+          </template>
         </div>
+      </div>
+
+      <div v-if="fullText && warnFullText" class="alert alert-warning">
+        <p>
+          {{ i18n.warnFullText }}
+        </p>
+      </div>
 
-        <div v-if="fullText && warnFullText" class="alert alert-warning">
-          <p>
-            {{ i18n.warnFullText }}
-          </p>
+      <div
+        v-if="!clearFormErrors && errors.body && errors.body.length > 0"
+        class="alert mb-2"
+        :class="{
+          'alert-danger': !bodyChanged,
+          'alert-warning': bodyChanged
+        }"
+      >
+        <ul class="list-unstyled my-0">
+          <li v-for="error in errors.body" :key="error.message">
+            {{ error.message }}
+          </li>
+        </ul>
+        <div v-if="showPlaceholderReplacer">
+          <button
+            type="button"
+            class="btn btn-secondary"
+            @click="fixBodyPlaceholders"
+          >
+            {{ i18n.fixPlaceholder }}
+          </button>
+        </div>
+      </div>
+      <div
+        v-else-if="bodyValidationErrors.length > 0"
+        class="alert mt-2"
+        :class="{
+          'alert-danger': !bodyChanged,
+          'alert-warning': bodyChanged
+        }"
+      >
+        <ul class="list-unstyled my-0">
+          <li v-for="error in bodyValidationErrors" :key="error">
+            {{ error }}
+          </li>
+        </ul>
+        <div v-if="showPlaceholderReplacer" class="mt-2">
+          <button
+            type="button"
+            class="btn btn-secondary btn-sm"
+            @click="fixBodyPlaceholders"
+          >
+            {{ i18n.fixPlaceholder }}
+          </button>
         </div>
+      </div>
 
+      <div class="row">
         <div
-          v-if="!clearFormErrors && errors.body && errors.body.length > 0"
-          class="alert mb-2"
-          :class="{
-            'alert-danger': !bodyChanged,
-            'alert-warning': bodyChanged
-          }"
+          :class="
+            savedFullTextBody && savedFullTextBodySidebyside
+              ? 'col-md-8 order-md-1'
+              : 'col'
+          "
         >
-          <ul class="list-unstyled my-0">
-            <li v-for="error in errors.body" :key="error.message">
-              {{ error.message }}
-            </li>
-          </ul>
-          <div v-if="showPlaceholderReplacer">
-            <button
-              type="button"
-              class="btn btn-secondary"
-              @click="fixBodyPlaceholders"
-            >
-              {{ i18n.fixPlaceholder }}
-            </button>
+          <div class="mb-4">
+            <label for="id_body"> {{ i18n.requestBody }}: </label>
           </div>
-        </div>
-        <div
-          v-else-if="bodyValidationErrors.length > 0"
-          class="alert mt-2"
-          :class="{
-            'alert-danger': !bodyChanged,
-            'alert-warning': bodyChanged
-          }"
-        >
-          <ul class="list-unstyled my-0">
-            <li v-for="error in bodyValidationErrors" :key="error">
-              {{ error }}
-            </li>
-          </ul>
-          <div v-if="showPlaceholderReplacer" class="mt-2">
-            <button
-              type="button"
-              class="btn btn-secondary btn-sm"
-              @click="fixBodyPlaceholders"
-            >
-              {{ i18n.fixPlaceholder }}
-            </button>
-          </div>
-        </div>
-
-        <div class="row">
-          <div
-            :class="
-              savedFullTextBody && savedFullTextBodySidebyside
-                ? 'col-md-8 order-md-1'
-                : 'col'
-            "
-          >
-            <div class="mb-4">
-              <label for="id_body"> {{ i18n.requestBody }}: </label>
-            </div>
-            <div v-if="!fullText" class="body-text" v-text="letterStart" />
-            <div
-              v-if="editingDisabled"
-              class="body-text-em mb-3"
-              v-text="body"
-            />
-            <textarea
-              v-show="!editingDisabled"
-              v-model="body"
-              ref="body"
-              id="id_body"
-              name="body"
-              required
-              class="form-control body-textarea"
-              :class="{
-                'is-invalid':
-                  (errors.body || bodyValid === false) && !bodyChanged,
-                attention: !hasBody
-              }"
-              :rows="bodyRows"
-              :placeholder="formFields.body.placeholder"
-              :minlength="formFields.body.min_length"
-              :maxlength="formFields.body.max_length"
-              @keydown="updateBody"
-              @keyup="resetBodyCustomValidity"
-              @change="updateBodyChanged(true)"
-            />
+          <div v-if="!fullText" class="body-text" v-text="letterStart" />
+          <div v-if="editingDisabled" class="body-text-em mb-3" v-text="body" />
+          <textarea
+            v-show="!editingDisabled"
+            v-model="body"
+            ref="body"
+            id="id_body"
+            name="body"
+            required
+            class="form-control body-textarea"
+            :class="{
+              'is-invalid':
+                (errors.body || bodyValid === false) && !bodyChanged,
+              attention: !hasBody
+            }"
+            :rows="bodyRows"
+            :placeholder="formFields.body.placeholder"
+            :minlength="formFields.body.min_length"
+            :maxlength="formFields.body.max_length"
+            @keydown="updateBody"
+            @keyup="resetBodyCustomValidity"
+            @change="updateBodyChanged(true)"
+          />
 
-            <div class="bg-secondary-subtle px-2 py-1 mb-4 mt-1 border">
-              <div class="d-flex justify-content-end gap-2">
-                <div class="form-check">
-                  <input
-                    v-if="!fullText"
-                    id="full_letter_checkbox"
-                    type="checkbox"
-                    class="form-check-input"
-                    v-model="fullLetter"
-                  />
-                  <input
-                    v-else
-                    id="full_letter_checkbox"
-                    type="checkbox"
-                    class="form-check-input"
-                    disabled
-                    :checked="true"
-                  />
-                  <label class="form-check-label" for="full_letter_checkbox"
-                    >Gesamten Nachrichtentext anzeigen</label
-                  >
-                </div>
-                <input v-model="fullText" type="hidden" name="full_text" />
-                <div
-                  v-if="allowFullText && !editingDisabled"
-                  class="form-check"
-                >
-                  <input
-                    id="full_text_checkbox"
-                    class="form-check-input"
-                    v-model="fullText"
-                    type="checkbox"
-                    name="full_text_checkbox"
-                    :disabled="fullTextDisabled"
-                  />
-                  <label for="full_text_checkbox" class="form-check-label">
-                    <i
-                      v-if="warnFullText"
-                      class="fa fa-exclamation-triangle"
-                      aria-hidden="true"
-                    />
-                    {{ formFields.full_text.label }}
-                  </label>
-                </div>
+          <div class="bg-secondary-subtle px-2 py-1 mb-4 mt-1 border">
+            <div class="d-sm-flex justify-content-end gap-2">
+              <div class="form-check">
+                <input
+                  v-if="!fullText"
+                  id="full_letter_checkbox"
+                  type="checkbox"
+                  class="form-check-input"
+                  v-model="fullLetter"
+                />
+                <input
+                  v-else
+                  id="full_letter_checkbox"
+                  type="checkbox"
+                  class="form-check-input"
+                  disabled
+                  :checked="true"
+                />
+                <label class="form-check-label" for="full_letter_checkbox">
+                  {{ i18n.showEntireMessage }}
+                </label>
               </div>
-              <div
-                class="d-flex justify-content-end mt-2"
-                v-if="fullTextDisabled"
-              >
-                <button
-                  class="btn btn-outline-secondary btn-sm"
-                  @click.prevent="resetFullText"
-                >
-                  {{ i18n.resetFullText }}
-                </button>
+              <input v-model="fullText" type="hidden" name="full_text" />
+              <div v-if="allowFullText && !editingDisabled" class="form-check">
+                <input
+                  id="full_text_checkbox"
+                  class="form-check-input"
+                  v-model="fullText"
+                  type="checkbox"
+                  name="full_text_checkbox"
+                  :disabled="fullTextDisabled"
+                />
+                <label for="full_text_checkbox" class="form-check-label">
+                  <i
+                    v-if="warnFullText"
+                    class="fa fa-exclamation-triangle"
+                    aria-hidden="true"
+                  />
+                  {{ formFields.full_text.label }}
+                </label>
               </div>
-              <details
-                v-if="savedFullTextBody && !savedFullTextBodySidebyside"
-                class="text-end mt-2"
+            </div>
+            <div
+              class="d-flex justify-content-end mt-2"
+              v-if="fullTextDisabled"
+            >
+              <button
+                class="btn btn-outline-secondary btn-sm"
+                @click.prevent="resetFullText"
               >
-                <summary>
-                  {{ i18n.savedFullTextChanges }}
-                </summary>
-                <textarea
-                  v-model="savedFullTextBody"
-                  class="saved-body"
-                  readonly
-                />
-              </details>
+                {{ i18n.resetFullText }}
+              </button>
             </div>
+            <details
+              v-if="savedFullTextBody && !savedFullTextBodySidebyside"
+              class="text-end mt-2"
+            >
+              <summary>
+                {{ i18n.savedFullTextChanges }}
+              </summary>
+              <textarea
+                v-model="savedFullTextBody"
+                class="saved-body"
+                readonly
+              />
+            </details>
+          </div>
 
-            <div v-if="!fullText && !fullLetter" class="body-text">
-              […]<br />{{ letterEndShort }}
-            </div>
+          <div v-if="!fullText && !fullLetter" class="body-text">
+            […]<br />{{ letterEndShort }}
+          </div>
 
-            <div v-if="!fullText && fullLetter" class="body-text">
-              {{ letterEnd }}
-            </div>
+          <div v-if="!fullText && fullLetter" class="body-text">
+            {{ letterEnd }}
+          </div>
 
-            <div v-if="letterSignature" class="body-text">
-              <em>{{ letterSignature }}</em>
-            </div>
-            <div
-              v-if="!letterSignature && fullText"
-              class="body-text"
-              v-text="letterSignatureName"
-            />
-            <div v-if="needles.length > 0" class="alert alert-warning mb-2">
-              <ul class="list-unstyled my-0">
-                <li v-for="needle in needles" :key="needle">
-                  {{ needle }}
-                </li>
-              </ul>
-            </div>
+          <div v-if="letterSignature" class="body-text">
+            <em>{{ letterSignature }}</em>
           </div>
           <div
-            v-if="savedFullTextBody && savedFullTextBodySidebyside"
-            class="col-md-4 order-md-2"
-          >
-            <h6>
-              {{ i18n.savedFullTextChanges }}
-            </h6>
-            <textarea v-model="savedFullTextBody" class="saved-body" readonly />
+            v-if="!letterSignature && fullText"
+            class="body-text"
+            v-text="letterSignatureName"
+          />
+          <div v-if="needles.length > 0" class="alert alert-warning mb-2">
+            <ul class="list-unstyled my-0">
+              <li v-for="needle in needles" :key="needle">
+                {{ needle }}
+              </li>
+            </ul>
           </div>
         </div>
+        <div
+          v-if="savedFullTextBody && savedFullTextBodySidebyside"
+          class="col-md-4 order-md-2"
+        >
+          <h6>
+            {{ i18n.savedFullTextChanges }}
+          </h6>
+          <textarea v-model="savedFullTextBody" class="saved-body" readonly />
+        </div>
       </div>
     </div>
 
-    <div v-if="hasUser && proofForm" class="card mb-3">
-      <div class="card-body">
-        <template v-if="proofRequired">
-          <h5>{{ i18n.includeProof }}</h5>
-          <ProofForm
-            :form="proofForm"
-            :required="proofRequired"
-            :config="config.proof_config"
-          ></ProofForm>
-        </template>
-        <details v-else>
-          <summary>{{ i18n.includeProof }}</summary>
-          <ProofForm
-            :form="proofForm"
-            :required="proofRequired"
-            :config="config.proof_config"
-          ></ProofForm>
-        </details>
-      </div>
+    <div
+      v-if="hasUser && proofForm"
+      class="border border-2 border-gray-300 p-3 mb-3"
+    >
+      <template v-if="proofRequired">
+        <h5>{{ i18n.includeProof }}</h5>
+        <ProofForm
+          :form="proofForm"
+          :required="proofRequired"
+          :config="config.proof_config"
+        ></ProofForm>
+      </template>
+      <details v-else>
+        <summary>{{ i18n.includeProof }}</summary>
+        <ProofForm
+          :form="proofForm"
+          :required="proofRequired"
+          :config="config.proof_config"
+        ></ProofForm>
+      </details>
     </div>
 
-    <div v-if="hasUser" class="card mb-3">
-      <div class="card-body">
-        <details
-          :open="
-            userForm?.errors?.address ||
-            addressValid === false ||
-            addressChanged === true ||
-            user?.address === ''
-          "
-        >
-          <summary>{{ i18n.updatePostalAddress }}</summary>
-          <UserAddress
-            :i18n="i18n"
-            :form="userForm"
-            :config="config"
-            :address-help-text="userForm.fields.address.help_text"
-            :default-law="defaultLaw"
-            class="mt-3"
-          />
-        </details>
-      </div>
+    <div v-if="hasUser" class="border border-2 border-gray-300 p-3 mb-3">
+      <details
+        :open="
+          userForm?.errors?.address ||
+          addressValid === false ||
+          addressChanged === true ||
+          user?.address === ''
+        "
+      >
+        <summary>{{ i18n.updatePostalAddress }}</summary>
+        <UserAddress
+          :i18n="i18n"
+          :form="userForm"
+          :config="config"
+          :address-help-text="userForm.fields.address.help_text"
+          :default-law="defaultLaw"
+          class="mt-3"
+        />
+      </details>
     </div>
 
     <UserConfirm
@@ -841,14 +827,6 @@ legend {
   color: $blue;
 }
 
-.request-hints {
-  color: $gray-700;
-  font-size: $font-size-sm;
-  ul {
-    padding-left: $spacer;
-  }
-}
-
 .publicbody-summary-container {
   margin: 0 0 $spacer * 2;
 }
diff --git a/frontend/javascript/components/makerequest/request-page.vue b/frontend/javascript/components/makerequest/request-page.vue
index df4735bcc..c4c5564c3 100644
--- a/frontend/javascript/components/makerequest/request-page.vue
+++ b/frontend/javascript/components/makerequest/request-page.vue
@@ -35,8 +35,10 @@
                   class="btn btn-link text-decoration-none ps-0"
                   :href="'#step-' + stepBack"
                   @click="setStep(stepBack)"
-                  >← <u>{{ i18n.back }}</u></a
                 >
+                  <span aria-hidden="true">←</span>
+                  <u>{{ i18n.back }}</u>
+                </a>
                 <button
                   v-if="topNextLabel"
                   type="button"
@@ -123,13 +125,22 @@
                 class="mt-3"
                 id="step_find_similar"
               >
-                <h2>{{ i18n.findSimilarRequests }}</h2>
-                <div class="row">
-                  <div class="col-lg-9">
-                    <DjangoSlot name="find-similar-requests-preamble" />
-                  </div>
-                </div>
-                <SimilarRequestSearch :config="config" />
+                <img
+                  src="../../../images/make-request/step-find-similar.avif"
+                  class="step-graphic"
+                  alt=""
+                />
+
+                <SimilarRequestSearch :config="config">
+                  <template #header>
+                    <h2>{{ i18n.findSimilarRequests }}</h2>
+                    <div class="row">
+                      <div class="col-lg-9">
+                        <DjangoSlot name="find-similar-requests-preamble" />
+                      </div>
+                    </div>
+                  </template>
+                </SimilarRequestSearch>
                 <div>
                   <button
                     type="button"
@@ -148,6 +159,13 @@
                 v-if="step === STEPS.SELECT_PUBLICBODY"
                 id="step_select_publicbody"
               >
+                <img
+                  src="../../../images/make-request/step-find-publicbody.avif"
+                  class="step-graphic"
+                  alt=""
+                  v-if="!multiRequest"
+                />
+
                 <p v-if="publicBodies.length > 0">
                   {{ i18n.currentlyChosen }}
                   {{ publicBodies.map((pb) => pb.name).join(', ') }}
@@ -169,8 +187,6 @@
                 <div v-else>
                   <div class="row">
                     <div class="col-lg-9">
-                      <DjangoSlot name="publicbody-legend-title" />
-                      <DjangoSlot name="publicbody-help-text" />
                       <PublicbodyBetaChooser
                         name="publicbody"
                         :defaultsearch="publicBodySearch"
@@ -186,6 +202,14 @@
                             @onlinehelp-click="onlineHelpShow($event)"
                           />
                         </template>
+                        <template #header>
+                          <DjangoSlot name="publicbody-legend-title" />
+                          <DjangoSlot
+                            name="publicbody-help-text"
+                            has-onlinehelp-links
+                            @onlinehelp-click="onlineHelpShow($event)"
+                          />
+                        </template>
                       </PublicbodyBetaChooser>
                       <DjangoSlot name="publicbody-missing" />
                     </div>
@@ -278,14 +302,19 @@
               >
                 <h2>{{ i18n.writeRequest }}</h2>
                 <div class="row">
-                  <div class="col-lg-9">
-                    <div v-show="!editingDisabled" class="alert alert-info">
+                  <div class="col-lg-3 order-lg-2">
+                    <div
+                      v-if="!editingDisabled"
+                      class="border border-2 border-yellow-200 p-3 tight-margin mb-3 request-hints"
+                    >
                       <DjangoSlot
                         name="request-hints"
                         has-onlinehelp-links
                         @onlinehelp-click="onlineHelpShow($event)"
                       />
                     </div>
+                  </div>
+                  <div class="col-lg-9">
                     <RequestForm
                       :config="config"
                       :publicbodies="publicBodies"
@@ -316,12 +345,6 @@
                         <DjangoSlot name="request-user-confirm" />
                       </template>
                     </RequestForm>
-                    <SimilarRequests
-                      v-if="showSimilar"
-                      :publicbodies="publicBodies"
-                      :subject="subject"
-                      :config="config"
-                    />
                   </div>
                 </div>
               </div>
@@ -390,7 +413,6 @@
 
 <script>
 import SimilarRequestSearch from './similar-request-search'
-import SimilarRequests from './similar-requests'
 // TODO: rename, un-beta, remove old?
 import DjangoSlot from '../../lib/django-slot.vue'
 import OnlineHelp from '../online-help.vue'
@@ -431,7 +453,6 @@ export default {
     IntroCampaigns,
     PublicbodyBetaChooser,
     PublicbodyMultiChooser,
-    SimilarRequests,
     SimilarRequestSearch,
     ReviewRequest,
     PbMultiReview,
@@ -925,6 +946,7 @@ export default {
 
 <style lang="scss" scoped>
 @import '../../../styles/variables';
+@import 'bootstrap/scss/mixins';
 
 .make-request-container {
   padding-bottom: 1rem;
@@ -949,12 +971,8 @@ legend {
   color: $blue;
 }
 
-.request-hints {
-  color: $gray-700;
-  font-size: $font-size-sm;
-  ul {
-    padding-left: $spacer;
-  }
+.request-hints :deep(ul) {
+  padding-left: $spacer;
 }
 
 .publicbody-summary-container {
@@ -1008,7 +1026,19 @@ legend {
   text-decoration: underline;
 }
 
-:deep(.campaign-logo) {
-  max-height: 6em;
+.step-graphic {
+  width: 100%;
+  display: block;
+  margin-bottom: $spacer;
+
+  @include media-breakpoint-up(md) {
+    position: relative;
+    height: 12rem;
+    width: auto;
+    max-width: 100%;
+    margin-bottom: -6rem;
+    margin-left: auto;
+    z-index: -1;
+  }
 }
 </style>
diff --git a/frontend/javascript/components/makerequest/similar-request-search-result.vue b/frontend/javascript/components/makerequest/similar-request-search-result.vue
index 25255d810..f64ac77ac 100644
--- a/frontend/javascript/components/makerequest/similar-request-search-result.vue
+++ b/frontend/javascript/components/makerequest/similar-request-search-result.vue
@@ -1,41 +1,34 @@
 <template>
   <!-- adapted from request_item.html -->
-  <div class="d-flex mb-4">
-    <a
-      v-if="object.status_representation"
-      :class="`flex-shrink-0 icon status-${object.status_representation} ${'--has-fee' && object.costs > 0}`"
-      :href="object.url"
-      :title="object.readable_status"
-    ></a>
-    <div class="flex-grow-1 ms-3">
+  <div class="d-flex">
+    <div class="flex-grow-1">
       <!-- cf. foirequest/snippets/request_item_inner.html;
          following comments indicate differences to there -->
       <div>
-        <h5 class="mt-0 mb-1">
-          <a :href="object.url" target="_blank">{{ object.title }}</a>
+        <h3 class="mt-0 mb-1 h5">
+          <a :href="object.url" target="_blank">
+            {{ object.title }}
+            <i class="fa fa-external-link" aria-hidden="true" />
+          </a>
           <!-- diff.: object.follower_count omitted -->
-        </h5>
+        </h3>
         <small>
-          <span
-            v-if="object.project"
-            v-html="
+          <span v-if="object.project">
+            {{
               i18n._('searchToProject', {
                 name: object.public_body.name,
-                url: object.public_body.site_url,
-                urlp: object.project_site_url,
                 count: object.project_request_count
               })
-            "
-          />
+            }}
+          </span>
           <span v-else-if="object.public_body_name">{{
             i18n._('searchToPbName', { name: object.public_body_name })
           }}</span>
           <span v-else-if="object.public_body">
-            {{ i18n.to }}
-            <a :href="object.public_body.site_url">{{
-              object.public_body.name
-            }}</a>
-            – {{ object.jurisdiction_name }}
+            {{ object.public_body.name }}
+            <template v-if="showJurisdiction"
+              >– {{ object.jurisdiction_name }}</template
+            >
           </span>
           <span v-else>
             {{ i18n.notYetSet }}
@@ -48,22 +41,29 @@
           >
             {{ i18n.searchSelectThisPb }}
           </button>
-          <br />
-          {{ object.readable_status }},
+        </small>
+        <div>
+          <span class="badge rounded-pill" :class="[statusColorClass]">{{
+            object.readable_status
+          }}</span>
           <!-- diff.: not timesince/"ago", instead "Month YYYY" -->
-          <time :datetime="object.last_message">
+          <time :datetime="object.last_message" class="ms-2 small">
             {{ formatDate(object.last_message) }}
           </time>
           <!-- diff.: costs omitted -->
           <!-- diff.: same_as_count/identical hint omitted -->
-        </small>
+        </div>
+        <div class="small text-secondary mt-1">
+          {{ object.description.substring(0, 200) }}
+          {{ object.description.length > 200 ? '…' : '' }}
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import { inject } from 'vue'
+import { computed, inject } from 'vue'
 import { useStore } from 'vuex'
 import { SET_STEP, STEPS } from '../../store/mutation_types'
 
@@ -73,13 +73,23 @@ const pbScope = inject('pbScope')
 
 const i18n = inject('i18n')
 
-const { object } = defineProps({
+const props = defineProps({
   object: {
     type: Object,
     required: true
   }
 })
 
+const statusColors = {
+  awaiting_response: 'text-bg-yellow-200',
+  successful: 'text-bg-success',
+  partially_successful: 'text-bg-success',
+  refused: 'text-bg-danger',
+  user_withdrew_costs: 'text-bg-danger'
+}
+
+const { object } = props
+
 const selectPublicBody = (id) => {
   store
     .dispatch('setPublicBodyById', { id, scope: pbScope })
@@ -94,4 +104,12 @@ const formatDate = (date) =>
     year: 'numeric',
     month: 'long'
   })
+
+const showJurisdiction = computed(() => {
+  return !props.object.public_body.name.includes(props.object.jurisdiction_name)
+})
+
+const statusColorClass = computed(
+  () => statusColors[props.object.status_representation] ?? 'text-bg-gray-300'
+)
 </script>
diff --git a/frontend/javascript/components/makerequest/similar-request-search.vue b/frontend/javascript/components/makerequest/similar-request-search.vue
index efbc7864c..f3fbafd8b 100644
--- a/frontend/javascript/components/makerequest/similar-request-search.vue
+++ b/frontend/javascript/components/makerequest/similar-request-search.vue
@@ -1,276 +1,265 @@
 <template>
-  <div>
-    <div class="row mb-3">
-      <!-- Text query input -->
-
-      <div class="col col-md-9">
-        <div class="input-group">
-          <input
-            class="form-control"
-            type="search"
-            v-model="textQuery"
-            :placeholder="i18n.searchRequests"
-          />
-          <button
-            type="button"
-            class="btn btn-secondary"
-            @click="search"
-            :disabled="isSearching"
-          >
-            <span class="fa fa-search" aria-hidden="true" />
-            {{ i18n.search }}
-          </button>
-        </div>
-      </div>
-    </div>
-
-    <div class="row">
-      <!-- Dropdown Jurisdiction -->
-
-      <div class="col-sm-3">
-        <div class="dropdown my-1 my-sm-0">
-          <button
-            type="button"
-            class="btn btn-secondary dropdown-toggle d-block w-100"
-            data-bs-toggle="dropdown"
-          >
-            {{ i18n.level }}
-          </button>
-          <div class="dropdown-menu p-3">
-            <ul class="list-unstyled mb-0">
-              <li
-                v-for="(jurisdictions, regionKind) in jurisdictionsByRegionKind"
-                :key="regionKind"
-              >
-                <div class="form-check">
-                  <input
-                    type="radio"
-                    :id="regionKind"
-                    class="form-check-input"
-                    name="regionkind"
-                    v-model="jurisdictionRegionKind"
-                    :value="regionKind"
-                  />
-                  <label :for="regionKind" class="form-check-label">{{
-                    jurisdictions.name
-                  }}</label>
-                </div>
-              </li>
-            </ul>
-          </div>
-        </div>
-      </div>
-
-      <!-- Dropdown Sub-Jurisdiction -->
-
+  <div class="row">
+    <div class="col col-md-9">
       <div
-        class="col-sm-3"
-        v-if="
-          jurisdictionsByRegionKind[jurisdictionRegionKind]?.items.length > 1
-        "
+        class="border border-2 border-gray-300 p-3 text-bg-body bg-opacity-90 mb-3"
       >
-        <div class="dropdown my-1 my-sm-0">
-          <button
-            type="button"
-            class="btn btn-secondary dropdown-toggle d-block w-100"
-            data-bs-toggle="dropdown"
-          >
-            {{ jurisdictionsByRegionKind[jurisdictionRegionKind].name }}
-          </button>
-          <div class="dropdown-menu p-3">
-            <ul class="list-unstyled">
-              <li
-                v-for="jurisdiction in jurisdictionsByRegionKind[
-                  jurisdictionRegionKind
-                ].items"
-                :key="jurisdiction.id"
-              >
-                <div class="form-check">
-                  <!-- alt: multiple jurisdictions stub
-                    <input
-                    type="checkbox"
-                    :id="'j' + jurisdiction.id"
-                    class="form-check-input"
-                    name="jurisdiction"
-                    :value="jurisdiction"
-                    v-model="selectedJurisdictions"
-                    />-->
-                  <input
-                    type="radio"
-                    :id="'j' + jurisdiction.id"
-                    class="form-check-input"
-                    name="jurisdiction"
-                    :value="jurisdiction"
-                    v-model="selectedJurisdiction"
-                  />
-                  <label
-                    :for="'j' + jurisdiction.id"
-                    class="form-check-label"
-                    >{{ jurisdiction.name }}</label
-                  >
-                </div>
-              </li>
-            </ul>
-          </div>
-        </div>
-      </div>
-
-      <!-- Dropdown time range -->
-
-      <div class="col-sm-3">
-        <div class="dropdown my-1 my-sm-0">
-          <button
-            type="button"
-            class="btn btn-secondary dropdown-toggle d-block w-100"
-            data-bs-toggle="dropdown"
-            data-bs-auto-close="outside"
-          >
-            {{ i18n.dateRange }}
-          </button>
-          <div class="dropdown-menu p-3">
-            <div class="d-flex flex-column flex-md-row align-items-center">
-              <!-- alt: label, date input
-              <label for="date_start" class="form-label g-col-sm-4">From</label>
-              <input id="date_start" type="date" class="form-control g-col-sm-8" v-model="dateStart" />
-              -->
-              <select
-                class="form-select"
-                :aria-label="i18n.dateRangeFrom"
-                v-model="dateStart"
-                style="min-width: 10ch"
-              >
-                <option :value="null"></option>
-                <option
-                  v-for="year in dateYearsStart"
-                  :key="year"
-                  :value="year"
+        <slot name="header" />
+
+        <fieldset>
+          <div class="row mb-3">
+            <!-- Text query input -->
+            <div class="">
+              <div class="input-group">
+                <input
+                  class="form-control"
+                  type="search"
+                  v-model="textQuery"
+                  :placeholder="i18n.searchRequests"
+                />
+                <button
+                  type="button"
+                  class="btn btn-secondary"
+                  @click="search"
+                  :disabled="isSearching"
                 >
-                  {{ year }}
-                </option>
-              </select>
-              <span class="px-1">&mdash;</span>
-              <!-- alt: label, date input
-              <label for="date_end" class="form-label g-col-sm-4">To</label>
-              <input id="date_end" type="date" class="form-control g-col-sm-8" v-model="dateEnd" />
-              -->
-              <select
-                class="form-select"
-                :aria-label="i18n.dateRangeTo"
-                v-model="dateEnd"
-                style="min-width: 10ch"
-              >
-                <option :value="null"></option>
-                <option v-for="year in dateYearsEnd" :key="year" :value="year">
-                  {{ year }}
-                </option>
-              </select>
+                  <span class="fa fa-search" aria-hidden="true" />
+                  {{ i18n.search }}
+                </button>
+              </div>
             </div>
           </div>
-        </div>
-      </div>
-
-      <!-- Dropdown Campaign -->
-
-      <div class="col-sm-3">
-        <div class="dropdown my-1 my-sm-0">
-          <button
-            type="button"
-            class="btn btn-secondary dropdown-toggle d-block w-100"
-            data-bs-toggle="dropdown"
-          >
-            {{ i18n.campaign }}
-          </button>
-          <div class="dropdown-menu p-3">
-            <ul class="list-unstyled mb-0">
-              <li v-for="campaign in campaigns" :key="campaign.id">
-                <div class="form-check">
-                  <input
-                    type="radio"
-                    :id="'campaign_' + campaign.id"
-                    class="form-check-input"
-                    name="campaign"
-                    :value="campaign"
-                    v-model="selectedCampaign"
-                  />
-                  <label
-                    :for="'campaign_' + campaign.id"
-                    class="form-check-label"
-                    >{{ campaign.name }}</label
+          <div class="row">
+            <!-- Dropdown Jurisdiction -->
+            <div class="col-sm-4">
+              <div class="dropdown my-1 my-sm-0">
+                <button
+                  type="button"
+                  class="btn btn-secondary dropdown-toggle d-block w-100"
+                  data-bs-toggle="dropdown"
+                >
+                  {{ i18n.level }}
+                </button>
+                <div class="dropdown-menu p-3">
+                  <ul class="list-unstyled mb-0">
+                    <li
+                      v-for="(
+                        jurisdictions, regionKind
+                      ) in jurisdictionsByRegionKind"
+                      :key="regionKind"
+                    >
+                      {{ jurisdicitions }}
+                      <div class="form-check">
+                        <input
+                          type="radio"
+                          :id="regionKind"
+                          class="form-check-input"
+                          name="regionkind"
+                          v-model="jurisdictionRegionKind"
+                          :value="regionKind"
+                        />
+                        <label :for="regionKind" class="form-check-label">{{
+                          jurisdictions.name
+                        }}</label>
+                      </div>
+                      <ul
+                        v-if="jurisdictions.items.length > 1"
+                        class="list-unstyled ms-3"
+                      >
+                        <li
+                          v-for="jurisdiction in jurisdictions.items"
+                          :key="jurisdiction.id"
+                        >
+                          <div class="form-check">
+                            <input
+                              type="radio"
+                              :id="'j' + jurisdiction.id"
+                              class="form-check-input"
+                              name="jurisdiction"
+                              :value="jurisdiction"
+                              v-model="selectedJurisdiction"
+                            />
+                            <label
+                              :for="'j' + jurisdiction.id"
+                              class="form-check-label"
+                              >{{ jurisdiction.name }}</label
+                            >
+                          </div>
+                        </li>
+                      </ul>
+                    </li>
+                  </ul>
+                </div>
+              </div>
+            </div>
+            <!-- Dropdown time range -->
+            <div class="col-sm-4">
+              <div class="dropdown my-1 my-sm-0">
+                <button
+                  type="button"
+                  class="btn btn-secondary dropdown-toggle d-block w-100"
+                  data-bs-toggle="dropdown"
+                  data-bs-auto-close="outside"
+                >
+                  {{ i18n.dateRange }}
+                </button>
+                <div class="dropdown-menu p-3">
+                  <div
+                    class="d-flex flex-column flex-md-row align-items-center"
                   >
+                    <!-- alt: label, date input
+                    <label for="date_start" class="form-label g-col-sm-4">From</label>
+                    <input id="date_start" type="date" class="form-control g-col-sm-8" v-model="dateStart" />
+                    -->
+                    <select
+                      class="form-select"
+                      :aria-label="i18n.dateRangeFrom"
+                      v-model="dateStart"
+                      style="min-width: 10ch"
+                    >
+                      <option :value="null"></option>
+                      <option
+                        v-for="year in dateYearsStart"
+                        :key="year"
+                        :value="year"
+                      >
+                        {{ year }}
+                      </option>
+                    </select>
+                    <span class="px-1">&mdash;</span>
+                    <!-- alt: label, date input
+                    <label for="date_end" class="form-label g-col-sm-4">To</label>
+                    <input id="date_end" type="date" class="form-control g-col-sm-8" v-model="dateEnd" />
+                    -->
+                    <select
+                      class="form-select"
+                      :aria-label="i18n.dateRangeTo"
+                      v-model="dateEnd"
+                      style="min-width: 10ch"
+                    >
+                      <option :value="null"></option>
+                      <option
+                        v-for="year in dateYearsEnd"
+                        :key="year"
+                        :value="year"
+                      >
+                        {{ year }}
+                      </option>
+                    </select>
+                  </div>
                 </div>
-              </li>
-            </ul>
+              </div>
+            </div>
+            <!-- Dropdown Campaign -->
+            <div class="col-sm-4">
+              <div class="dropdown my-1 my-sm-0">
+                <button
+                  type="button"
+                  class="btn btn-secondary dropdown-toggle d-block w-100"
+                  data-bs-toggle="dropdown"
+                >
+                  {{ i18n.campaign }}
+                </button>
+                <div class="dropdown-menu p-3">
+                  <ul class="list-unstyled mb-0">
+                    <li>
+                      <div class="form-check">
+                        <input
+                          type="radio"
+                          id="campaign_none"
+                          class="form-check-input"
+                          name="campaign"
+                          :value="null"
+                          v-model="selectedCampaign"
+                        />
+                        <label for="campaign_none" class="form-check-label">
+                          {{ i18n.noCampaign }}
+                        </label>
+                      </div>
+                    </li>
+                    <li v-for="campaign in campaigns" :key="campaign.id">
+                      <div class="form-check">
+                        <input
+                          type="radio"
+                          :id="'campaign_' + campaign.id"
+                          class="form-check-input"
+                          name="campaign"
+                          :value="campaign"
+                          v-model="selectedCampaign"
+                        />
+                        <label
+                          :for="'campaign_' + campaign.id"
+                          class="form-check-label"
+                          >{{ campaign.name }}</label
+                        >
+                      </div>
+                    </li>
+                  </ul>
+                </div>
+              </div>
+            </div>
           </div>
-        </div>
+          <!-- Active filter badges -->
+          <div class="mt-3 d-flex flex-wrap gap-2">
+            <!-- Badges: Jurisdiction/kind + sub-jurisdiction -->
+            <PbFilterBadge
+              v-if="
+                jurisdictionsByRegionKind[jurisdictionRegionKind]?.items
+                  .length === 1 ||
+                (jurisdictionRegionKind &&
+                  jurisdictionsByRegionKind[jurisdictionRegionKind] &&
+                  !selectedJurisdiction)
+              "
+              class="mb-1"
+              @remove-click="jurisdictionRegionKind = null"
+              :label="i18n.level"
+              :value="jurisdictionsByRegionKind[jurisdictionRegionKind].name"
+            />
+            <!-- alt
+              <PbFilterBadge
+                v-if="selectedJurisdictions.size > 0"
+                v-for="jurisdiction in selectedJurisdictions"
+                :key="jurisdiction.id"
+                @remove-click="selectedJurisdictions.delete(jurisdiction)"
+                :value="jurisdiction.name"
+                :label="'TODO'"
+                />
+            -->
+            <PbFilterBadge
+              v-if="selectedJurisdiction"
+              class="mb-1"
+              @remove-click="selectedJurisdiction = null"
+              :label="i18n['groupBy_' + selectedJurisdiction.region_kind]"
+              :value="selectedJurisdiction.name"
+            />
+            <!-- Badges: from/to year -->
+            <PbFilterBadge
+              v-if="dateStart"
+              class="mb-1"
+              @remove-click="dateStart = null"
+              :label="i18n.dateRangeFrom"
+              :value="dateStart"
+            />
+            <PbFilterBadge
+              v-if="dateEnd"
+              class="mb-1"
+              @remove-click="dateEnd = null"
+              :label="i18n.dateRangeTo"
+              :value="dateEnd"
+            />
+            <!-- Badge: campaign -->
+            <PbFilterBadge
+              v-if="selectedCampaign"
+              @remove-click="selectedCampaign = null"
+              class="mb-1"
+              :label="i18n.campaign"
+              :value="selectedCampaign.name"
+            />
+          </div>
+        </fieldset>
       </div>
     </div>
 
-    <!-- Active filter badges -->
-
-    <div class="my-3 d-flex flex-wrap gap-2">
-      <!-- Badges: Jurisdiction/kind + sub-jurisdiction -->
-
-      <PbFilterBadge
-        v-if="
-          jurisdictionsByRegionKind[jurisdictionRegionKind]?.items.length ===
-            1 ||
-          (jurisdictionRegionKind &&
-            jurisdictionsByRegionKind[jurisdictionRegionKind] &&
-            !selectedJurisdiction)
-        "
-        class="mb-1"
-        @remove-click="jurisdictionRegionKind = null"
-        :label="i18n.level"
-        :value="jurisdictionsByRegionKind[jurisdictionRegionKind].name"
-      />
-
-      <!-- alt
-        <PbFilterBadge
-          v-if="selectedJurisdictions.size > 0"
-          v-for="jurisdiction in selectedJurisdictions"
-          :key="jurisdiction.id"
-          @remove-click="selectedJurisdictions.delete(jurisdiction)"
-          :value="jurisdiction.name"
-          :label="'TODO'"
-          />
-      -->
-
-      <PbFilterBadge
-        v-if="selectedJurisdiction"
-        class="mb-1"
-        @remove-click="selectedJurisdiction = null"
-        :label="i18n['groupBy_' + jurisdictionRegionKind]"
-        :value="selectedJurisdiction.name"
-      />
-
-      <!-- Badges: from/to year -->
-
-      <PbFilterBadge
-        v-if="dateStart"
-        class="mb-1"
-        @remove-click="dateStart = null"
-        :label="i18n.dateRangeFrom"
-        :value="dateStart"
-      />
-      <PbFilterBadge
-        v-if="dateEnd"
-        class="mb-1"
-        @remove-click="dateEnd = null"
-        :label="i18n.dateRangeTo"
-        :value="dateEnd"
-      />
-
-      <!-- Badge: campaign -->
-
-      <PbFilterBadge
-        v-if="selectedCampaign"
-        @remove-click="selectedCampaign = null"
-        class="mb-1"
-        :label="i18n.campaign"
-        :value="selectedCampaign.name"
-      />
-    </div>
-
     <!-- API errors -->
 
     <div v-if="apiError" class="alert alert-danger alert-dismissible">
@@ -293,11 +282,15 @@
 
       <ResultsPagination :response-meta="resultsMeta" v-model="pagination" />
 
-      <ul class="list-unstyled">
-        <li v-for="object in results" :key="object.id">
-          <SimilarRequestSearchResult :object="object" />
-        </li>
-      </ul>
+      <div class="row">
+        <div class="col-lg-9">
+          <ul class="list-unstyled vstack gap-5">
+            <li v-for="object in results" :key="object.id">
+              <SimilarRequestSearchResult :object="object" />
+            </li>
+          </ul>
+        </div>
+      </div>
 
       <ResultsPagination :response-meta="resultsMeta" v-model="pagination" />
     </div>
@@ -351,9 +344,13 @@ const selectedJurisdiction = ref(initialState.selectedJurisdiction)
 // n.b. new Set! alt: multiple selectable, currently unused
 // const selectedJurisdictions = ref(new Set(initialState.selectedJurisdictions))
 
-watch(jurisdictionRegionKind, () => {
+watch(jurisdictionRegionKind, (value) => {
   // selectedJurisdictions.value.clear()
-  selectedJurisdiction.value = null
+  if (value) selectedJurisdiction.value = null
+})
+
+watch(selectedJurisdiction, (value) => {
+  if (value) jurisdictionRegionKind.value = null
 })
 
 // populate by fetching from API...
@@ -378,7 +375,7 @@ jurisdictionList().then((resp) => {
 })
 
 const campaigns = ref([])
-const selectedCampaign = ref(initialState.selectedCampaign)
+const selectedCampaign = ref(initialState.selectedCampaign ?? null)
 
 campaignList().then((resp) => {
   campaigns.value = resp.data.objects
diff --git a/frontend/javascript/components/makerequest/similar-requests.vue b/frontend/javascript/components/makerequest/similar-requests.vue
deleted file mode 100644
index 2e725e7c2..000000000
--- a/frontend/javascript/components/makerequest/similar-requests.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-  <div class="row">
-    <div class="col-md-12">
-      <div v-if="hasResources || hasSimilarRequests" class="card mb-3">
-        <h5 class="card-header">
-          {{ i18n.similarExist }}
-        </h5>
-        <div class="card-body">
-          <div class="row">
-            <div v-show="hasResources" class="col-md-6">
-              <h6>
-                {{ i18n.relevantResources }}
-              </h6>
-              <ul>
-                <li v-if="publicBody?.url">
-                  <a :href="publicBody.url" target="_blank" rel="noopener">
-                    {{ i18n.officialWebsite }} {{ publicBody.name }}
-                  </a>
-                </li>
-              </ul>
-            </div>
-            <div v-show="hasSimilarRequests" class="col-md-6">
-              <h6>
-                {{ i18n.similarRequests }}
-              </h6>
-              <ul class="similar-requests">
-                <li v-for="req in similarRequests" :key="req.url">
-                  <a :href="req.url" target="_blank">
-                    {{ req.title }}
-                  </a>
-                </li>
-              </ul>
-              <p v-if="moreSimilarRequestsAvailable">
-                <a :href="searchUrl" target="_blank">
-                  {{ i18n.moreSimilarRequests }}
-                </a>
-              </p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import debounce from 'lodash.debounce'
-
-import { FroideAPI } from '../../lib/api'
-import I18nMixin from '../../lib/i18n-mixin'
-
-const MAX_SIMILAR = 5
-
-export default {
-  name: 'SimilarRequests',
-  props: ['config', 'publicbodies', 'subject'],
-  mixins: [I18nMixin],
-  data() {
-    return {
-      similarRequests: [],
-      searches: {},
-      moreSimilarRequestsAvailable: false
-    }
-  },
-  created() {
-    this.search = new FroideAPI(this.config)
-    this.runSearch()
-  },
-  computed: {
-    hasResources() {
-      return this.publicBody && this.publicBody.url
-    },
-    hasSimilarRequests() {
-      return this.similarRequests.length > 0
-    },
-    searchUrl() {
-      return this.config.url.search + '?q=' + encodeURIComponent(this.subject)
-    },
-    debouncedSearch() {
-      return debounce(this.runSearch, 1000)
-    },
-    publicBody() {
-      return this.publicbodies[0]
-    }
-  },
-  methods: {
-    runSearch() {
-      if (!this.subject) {
-        return
-      }
-      if (this.searches[this.subject] !== undefined) {
-        if (this.searches[this.subject] !== false) {
-          this.similarRequests = this.searches[this.subject]
-        }
-        return
-      }
-      this.searches[this.subject] = false
-      ;((subject) => {
-        this.search.searchFoiRequests(subject).then((result) => {
-          this.moreSimilarRequestsAvailable = result.length > MAX_SIMILAR
-          this.similarRequests = result.slice(0, MAX_SIMILAR)
-          this.searches[subject] = result
-        })
-      })(this.subject)
-    }
-  },
-  watch: {
-    subject: function () {
-      this.debouncedSearch()
-    }
-  }
-}
-</script>
diff --git a/frontend/javascript/components/makerequest/user-address.vue b/frontend/javascript/components/makerequest/user-address.vue
index f0e554fe4..15ce195a6 100644
--- a/frontend/javascript/components/makerequest/user-address.vue
+++ b/frontend/javascript/components/makerequest/user-address.vue
@@ -11,7 +11,7 @@
     >
       {{ i18n.yourAddress }}
     </label>
-    <div class="col-sm-8 col-md-9">
+    <div class="col-sm-8 col-md-5">
       <div>
         <textarea
           v-model="address"
diff --git a/frontend/javascript/components/postupload/post-upload.vue b/frontend/javascript/components/postupload/post-upload.vue
index 6a2830147..03a63e21b 100644
--- a/frontend/javascript/components/postupload/post-upload.vue
+++ b/frontend/javascript/components/postupload/post-upload.vue
@@ -827,14 +827,16 @@ addEventListener('hashchange', () => {
   <div class="container">
     <!-- TODO button does not support going back throug pdfRedactionCurrentIndex-->
     <div v-if="step === STEP_INTRO" class="my-3">
-      <a class="btn btn-link text-decoration-none ps-0" href="../.."
-        >← <u>{{ i18n.cancel }}</u></a
-      >
+      <a class="btn btn-link text-decoration-none ps-0" href="../..">
+        <span aria-hidden="true">←</span>
+        <u>{{ i18n.cancel }}</u>
+      </a>
     </div>
     <div v-else-if="step !== STEP_OUTRO" class="my-3">
-      <a @click="backStep" class="btn btn-link text-decoration-none ps-0"
-        >← <u>{{ i18n.back }}</u></a
-      >
+      <a @click="backStep" class="btn btn-link text-decoration-none ps-0">
+        <span aria-hidden="true">←</span>
+        <u>{{ i18n.back }}</u>
+      </a>
     </div>
   </div>
 
diff --git a/frontend/javascript/components/publicbody/pb-beta-list.vue b/frontend/javascript/components/publicbody/pb-beta-list.vue
index 81b2a28d7..1166ad723 100644
--- a/frontend/javascript/components/publicbody/pb-beta-list.vue
+++ b/frontend/javascript/components/publicbody/pb-beta-list.vue
@@ -76,11 +76,14 @@ export default {
 }
 
 .search-result {
-  border-top: 1px solid #ccc;
   margin-top: 1rem;
   padding-top: 1rem;
   cursor: pointer;
 
+  &:not(:first-child) {
+    border-top: 1px solid $gray-300;
+  }
+
   .row {
     padding: 1rem 0;
     &:hover {
diff --git a/frontend/javascript/components/publicbody/publicbody-beta-chooser.vue b/frontend/javascript/components/publicbody/publicbody-beta-chooser.vue
index 26cd4b563..91955eda6 100644
--- a/frontend/javascript/components/publicbody/publicbody-beta-chooser.vue
+++ b/frontend/javascript/components/publicbody/publicbody-beta-chooser.vue
@@ -1,82 +1,89 @@
 <template>
   <div class="publicbody-chooser mb-3">
-    <button
-      v-if="!showSearch"
-      class="btn btn-sm btn-light float-end"
-      @click.prevent="showSearch = true"
-    >
-      {{ i18n.searchPublicBodyLabel }}
-    </button>
-    <div v-if="showSearch" class="form-search">
-      <div class="input-group">
-        <input
-          v-model="search"
-          type="search"
-          class="search-public_bodies form-control"
-          :placeholder="i18n.publicBodySearchPlaceholder"
-          @keyup="triggerAutocomplete"
-          @keydown.enter.prevent="triggerAutocomplete"
-        />
+    <div>
+      <div
+        class="border border-2 border-gray-300 p-3 text-bg-body bg-opacity-90 mb-3"
+      >
+        <slot name="header" />
+
         <button
-          type="button"
-          class="btn btn-secondary search-public_bodies-submit"
-          @click="triggerAutocomplete"
+          v-if="!showSearch"
+          class="btn btn-sm btn-light float-end"
+          @click.prevent="showSearch = true"
         >
-          <i class="fa fa-search" />
-          {{ i18n.search }}
+          {{ i18n.searchPublicBodyLabel }}
         </button>
-      </div>
-
-      <div v-if="showFilters" class="row mt-3">
-        <div
-          v-for="filterKey in filterOrder"
-          :key="filterKey"
-          class="col-sm-4 filter-column position-relative"
-        >
-          <PbFilter
-            :global-config="config"
-            :config="filterConfig[filterKey]"
+        <div v-if="showSearch" class="form-search">
+          <div class="input-group">
+            <input
+              v-model="search"
+              type="search"
+              class="search-public_bodies form-control"
+              :placeholder="i18n.publicBodySearchPlaceholder"
+              @keyup="triggerAutocomplete"
+              @keydown.enter.prevent="triggerAutocomplete"
+            />
+            <button
+              type="button"
+              class="btn btn-secondary search-public_bodies-submit"
+              @click="triggerAutocomplete"
+            >
+              <i class="fa fa-search" />
+              {{ i18n.search }}
+            </button>
+          </div>
+          <div v-if="showFilters" class="row mt-3">
+            <div
+              v-for="filterKey in filterOrder"
+              :key="filterKey"
+              class="col-sm-4 filter-column position-relative"
+            >
+              <PbFilter
+                :global-config="config"
+                :config="filterConfig[filterKey]"
+                :i18n="i18n"
+                :scope="scope"
+                :value="filters[filterKey]"
+                @update="updateFilter"
+              />
+            </div>
+          </div>
+          <div class="mt-3" v-if="$slots['search-hint']">
+            <slot name="search-hint"></slot>
+          </div>
+        </div>
+        <div class="row mt-3">
+          <p v-if="searching">
+            <span class="spinner-border spinner-border-sm" role="status">
+              <span class="visually-hidden">Loading...</span>
+            </span>
+          </p>
+          <p v-else-if="lastQuery && (showFoundCountIfIdle || searchMeta)">
+            {{
+              searching
+                ? '…'
+                : i18n._('publicBodiesFound', { count: searchResultsLength })
+            }}
+          </p>
+        </div>
+        <div v-if="showBadges" class="d-flex flex-wrap gap-2">
+          <PbFilterBadge
+            v-if="search"
+            :label="i18n.searchText"
+            :value="search"
             :i18n="i18n"
-            :scope="scope"
-            :value="filters[filterKey]"
+            @remove-click="search = ''"
+          />
+          <PbFilterSelected
+            v-for="filterKey in activeFilters"
+            :key="filterKey"
+            :config="filterConfig[filterKey]"
             @update="updateFilter"
+            :value="filters[filterKey]"
+            :i18n="i18n"
           />
         </div>
       </div>
-      <div class="mt-3" v-if="$slots['search-hint']">
-        <slot name="search-hint"></slot>
-      </div>
-    </div>
-    <div class="row mt-3">
-      <p v-if="searching">
-        <span class="spinner-border spinner-border-sm" role="status">
-          <span class="visually-hidden">Loading...</span>
-        </span>
-      </p>
-      <p v-else-if="lastQuery && (showFoundCountIfIdle || searchMeta)">
-        {{
-          searching
-            ? '…'
-            : i18n._('publicBodiesFound', { count: searchResultsLength })
-        }}
-      </p>
-    </div>
-    <div v-if="showBadges" class="mb-3 d-flex flex-wrap gap-2">
-      <PbFilterBadge
-        v-if="search"
-        :label="i18n.searchText"
-        :value="search"
-        :i18n="i18n"
-        @remove-click="search = ''"
-      />
-      <PbFilterSelected
-        v-for="filterKey in activeFilters"
-        :key="filterKey"
-        :config="filterConfig[filterKey]"
-        @update="updateFilter"
-        :value="filters[filterKey]"
-        :i18n="i18n"
-      />
     </div>
 
     <component
diff --git a/vite.config.ts b/vite.config.ts
index 8ebbef059..de11c0648 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -55,7 +55,7 @@ export default defineConfig({
             assetInfo.name?.match(/(\.(woff2?|eot|ttf|otf)|font\.svg)(\?.*)?$/)
           ) {
             return 'fonts/[name][extname]'
-          } else if (assetInfo.name?.match(/\.(jpg|png|svg)$/)) {
+          } else if (assetInfo.name?.match(/\.(jpg|png|svg|avif)$/)) {
             return 'img/[name][extname]'
           }