diff --git a/src/fellchensammlung/static/fellchensammlung/css/styles.css b/src/fellchensammlung/static/fellchensammlung/css/styles.css
index 6185987..8b2a05d 100644
--- a/src/fellchensammlung/static/fellchensammlung/css/styles.css
+++ b/src/fellchensammlung/static/fellchensammlung/css/styles.css
@@ -746,6 +746,10 @@ div.announcement {
 
 }
 
+.half {
+    width: 49%;
+}
+
 /************************/
 /* GENERAL HIGHLIGHTING */
 /************************/
diff --git a/src/fellchensammlung/templates/fellchensammlung/search.html b/src/fellchensammlung/templates/fellchensammlung/search.html
index 07e4c57..2f5613a 100644
--- a/src/fellchensammlung/templates/fellchensammlung/search.html
+++ b/src/fellchensammlung/templates/fellchensammlung/search.html
@@ -4,26 +4,31 @@
 {% block title %}<title>{% translate "Suche" %}</title>{% endblock %}
 
 {% block content %}
-    <form class="form-search card" method="post">
-        {% csrf_token %}
-        <input type="hidden" name="longitude" maxlength="200" id="longitude">
-        <input type="hidden" name="latitude" maxlength="200" id="latitude">
-        {{ search_form.as_p }}
-        <button class="btn" type="submit" value="search" name="search">
-            <i class="fas fa-search"></i> {% trans 'Suchen' %}
-        </button>
-        {% if searched %}
-            {% if subscribed_search %}
-                <button class="btn" type="submit" value="{{ subscribed_search.pk }}" name="unsubscribe_to_search">
-                    <i class="fas fa-bell-slash"></i> {% trans 'Suche nicht mehr abonnieren' %}
-                </button>
-            {% else %}
-                <button class="btn" type="submit" name="subscribe_to_search">
-                    <i class="fas fa-bell"></i> {% trans 'Suche abonnieren' %}
-                </button>
+    <div class="container-cards">
+        <form class="form-search card half" method="post">
+            {% csrf_token %}
+            <input type="hidden" name="longitude" maxlength="200" id="longitude">
+            <input type="hidden" name="latitude" maxlength="200" id="latitude">
+            {{ search_form.as_p }}
+            <button class="btn" type="submit" value="search" name="search">
+                <i class="fas fa-search"></i> {% trans 'Suchen' %}
+            </button>
+            {% if searched %}
+                {% if subscribed_search %}
+                    <button class="btn" type="submit" value="{{ subscribed_search.pk }}" name="unsubscribe_to_search">
+                        <i class="fas fa-bell-slash"></i> {% trans 'Suche nicht mehr abonnieren' %}
+                    </button>
+                {% else %}
+                    <button class="btn" type="submit" name="subscribe_to_search">
+                        <i class="fas fa-bell"></i> {% trans 'Suche abonnieren' %}
+                    </button>
+                {% endif %}
             {% endif %}
-        {% endif %}
-    </form>
+        </form>
+        <div class="card half">
+            {% include "fellchensammlung/partials/partial-map.html" %}
+        </div>
+    </div>
     {% if place_not_found %}
         <p class="error">{% translate "Ort nicht gefunden" %}</p>
     {% endif %}
diff --git a/src/fellchensammlung/views.py b/src/fellchensammlung/views.py
index 430b838..6ec0f65 100644
--- a/src/fellchensammlung/views.py
+++ b/src/fellchensammlung/views.py
@@ -199,7 +199,8 @@ def search(request):
                "search_form": search.search_form,
                "place_not_found": search.place_not_found,
                "subscribed_search": subscribed_search,
-               "searched": searched}
+               "searched": searched,
+               "adoption_notices_map": AdoptionNotice.get_active_ANs()}
     return render(request, 'fellchensammlung/search.html', context=context)
 
 
@@ -518,7 +519,7 @@ def updatequeue(request):
 
 
 def map(request):
-    adoption_notices = AdoptionNotice.objects.all()  #TODO: Filter to active
+    adoption_notices = AdoptionNotice.get_active_ANs()
     context = {"adoption_notices_map": adoption_notices}
     return render(request, 'fellchensammlung/map.html', context=context)