diff --git a/lostplaces/lostplaces_app/templates/place/place_list.html b/lostplaces/lostplaces_app/templates/place/place_list.html
index 455779c..f0bcae8 100644
--- a/lostplaces/lostplaces_app/templates/place/place_list.html
+++ b/lostplaces/lostplaces_app/templates/place/place_list.html
@@ -2,57 +2,57 @@
 {% load static %}
 
 {% block additional_head %}
-    <link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
-    <script src="{% static 'maps/ol.js' %}"></script>
+<link rel="stylesheet" href="{% static 'maps/ol.css' %}" type="text/css">
+<script src="{% static 'maps/ol.js' %}"></script>
 {% endblock additional_head %}
 
 {% block title %}Lost Places{% endblock %}
 
 {% block maincontent %}
 
-{% include 'partials/osm_map.html' %}
+{% include 'partials/osm_map.html' with config=map_config %}
 <div class="LP-PlaceList">
     <h1 class="LP-Headline">Listing our places</h1>
     <ul class="LP-PlaceList__List">
         {% for place in place_list %}
-            <li class="LP-PlaceList__Item">
-                <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
-                    <article class="LP-PlaceTeaser LP-PlaceTeaser--extended">
-                        <div class="LP-PlaceTeaser__Image">
-                            <img class="LP-Image" src="{{ place.images.first.filename.thumbnail.url }}" />
+        <li class="LP-PlaceList__Item">
+            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+                <article class="LP-PlaceTeaser LP-PlaceTeaser--extended">
+                    <div class="LP-PlaceTeaser__Image">
+                        <img class="LP-Image" src="{{ place.images.first.filename.thumbnail.url }}" />
+                    </div>
+                    <div class="LP-PlaceTeaser__Meta">
+                        <div class="LP-PlaceTeaser__Info">
+                            <span class="LP-PlaceTeaser__Title">
+                                <h2 class="LP-Headline LP-Headline--teaser">{{place.name}}</h2>
+                            </span>
+                            <span class="LP-PlaceTeaser__Detail">
+                                <p class="LP-Paragraph">{{place.location}}</p>
+                            </span>
                         </div>
-                        <div class="LP-PlaceTeaser__Meta">
-                            <div class="LP-PlaceTeaser__Info">
-                                <span class="LP-PlaceTeaser__Title">
-                                    <h2 class="LP-Headline LP-Headline--teaser">{{place.name}}</h2>
-                                </span>
-                                <span class="LP-PlaceTeaser__Detail">
-                                    <p class="LP-Paragraph">{{place.location}}</p>
-                                </span>
-                            </div>
-                            <div class="LP-PlaceTeaser__Description">
-                                <p class="LP-Paragraph">
-                                    {% if place.description|length > 210 %}
-                                        {{place.description|truncatechars:210|truncatewords:-1}}
-                                    {% else %}
-                                        {{place.description}}
-                                    {% endif %}
-                                </p>
-                            </div>
-                            <div class="LP-PlaceTeaser__Icons">
-                                <ul class="LP-Icon__List">
-                                    <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" /></li>
+                        <div class="LP-PlaceTeaser__Description">
+                            <p class="LP-Paragraph">
+                                {% if place.description|length > 210 %}
+                                {{place.description|truncatechars:210|truncatewords:-1}}
+                                {% else %}
+                                {{place.description}}
+                                {% endif %}
+                            </p>
+                        </div>
+                        <div class="LP-PlaceTeaser__Icons">
+                            <ul class="LP-Icon__List">
+                                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" /></li>
                                 <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/location.svg' %}" /></li>
                                 <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/flag.svg' %}" /></li>
-                                </ul>
-                            </div>
+                            </ul>
                         </div>
-                    </article>
-                </a>
-            </li>
+                    </div>
+                </article>
+            </a>
+        </li>
         {% endfor %}
     </ul>
-    
+
     {% include 'partials/nav/pagination.html' %}
 
 </div>
diff --git a/lostplaces/lostplaces_app/views/place_views.py b/lostplaces/lostplaces_app/views/place_views.py
index 9f8d8b9..505de0a 100644
--- a/lostplaces/lostplaces_app/views/place_views.py
+++ b/lostplaces/lostplaces_app/views/place_views.py
@@ -23,7 +23,10 @@ class PlaceListView(IsAuthenticated, ListView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['place_map_center'] = Place.average_latlon(context['place_list'])
+        context['map_config'] = {
+            'point_list': context['place_list'],
+            'map_center': Place.average_latlon(context['place_list'])
+        }
         return context
 
 class PlaceDetailView(IsAuthenticated, View):