diff --git a/events/admin.py b/events/admin.py
index 01c1966..be22307 100644
--- a/events/admin.py
+++ b/events/admin.py
@@ -87,7 +87,7 @@ class MemberAdmin(admin.ModelAdmin):
 admin.site.register(Member, MemberAdmin)
 
 class AttendeeAdmin(admin.ModelAdmin):
-    list_display = ('__str__', 'role', 'status')
+    list_display = ('__str__', 'role', 'status', 'last_reminded')
     list_filter = ('role', 'status')
 admin.site.register(Attendee, AttendeeAdmin)
 
diff --git a/get_together/templates/get_together/events/show_event.html b/get_together/templates/get_together/events/show_event.html
index 92c186b..bde73b8 100644
--- a/get_together/templates/get_together/events/show_event.html
+++ b/get_together/templates/get_together/events/show_event.html
@@ -58,6 +58,7 @@
 	            <td width="120px"><b>Place:</b></td><td>
                       {% if event.place %}
                           <a class="" href="{% url 'show-place' event.place.id %}">{{ event.place.name }}</a>
+                          {% if can_edit_event %}<a href="{% url 'add-place' event.id %}" class="btn btn-secondary btn-sm">Change</a>{% endif %}
                       {% elif can_edit_event %}
                           <a class="" href="{% url 'add-place' event.id %}">No place selected yet.</a>
                       {% else %}
diff --git a/get_together/templates/get_together/places/create_place.html b/get_together/templates/get_together/places/create_place.html
index d0270a3..04339db 100644
--- a/get_together/templates/get_together/places/create_place.html
+++ b/get_together/templates/get_together/places/create_place.html
@@ -8,6 +8,7 @@
             <h2>Choose your meeting place</h2>
             <form action="{% url "add-place" event.id %}" method="post">
             {% csrf_token %}
+            <input type="hidden" id="id_id" name="id" value="" />
             {% include "events/place_form.html" %}
 	            <div class="fluid-layout" id="place-map"></div>
             <br />
@@ -46,8 +47,8 @@
                 markers: [],
                 html_addr: null,
                 mapOptions: {
-                    zoom: 4,
-                    center: {lat: 51.8211, lng: 5.591},
+                    zoom: 12,
+                    center: {lat: {{event.team.city.latitude}}, lng: {{event.team.city.longitude}}},
                     mapTypeId: google.maps.MapTypeId.ROADMAP,
                     mapTypeControl: false
                 }
@@ -72,7 +73,7 @@
                                     name = this.long_name
                                 }
                             });
-                            if (name != "") {
+                            if (name != null && name != "") {
                                 $("#id_name").val(name);
                             }
                             $.getJSON("/api/find_city/?country="+country+"&spr="+spr+"&city="+city,
@@ -93,7 +94,7 @@
                 });
 
                 if (options.html_lng && options.html_lat) {
-                    if (location.lat() && location.lng()) {
+                    if (location.lat() != null && location.lng() != null) {
                         options.html_lat.val(location.lat());
                         options.html_lng.val(location.lng());
                         if (options.html_tz && options.html_country && options.html_continent) {
@@ -191,6 +192,23 @@
                     location = new google.maps.LatLng(options.html_lat.val(), options.html_lng.val());
                     setMarker(map, location);
                 }
+
+                $.getJSON("/api/places/", function(data) {
+                    for (let place of data) {
+                        var position = new google.maps.LatLng(place['latitude'], place['longitude'])
+                        var marker = new google.maps.Marker({
+                          position: position,
+                          label: place['name'],
+                          map: map,
+                        });
+                        google.maps.event.addListener(marker, 'click',function(event) {
+                          $("#id_id").val(place['id']);
+                          $("#id_name").val(place['name']);
+                          showPositionHTML(this.position);
+                        });
+                    }
+                    return;
+                });
             });
 
         }
diff --git a/get_together/templates/get_together/places/show_place.html b/get_together/templates/get_together/places/show_place.html
index 24050a9..daac306 100644
--- a/get_together/templates/get_together/places/show_place.html
+++ b/get_together/templates/get_together/places/show_place.html
@@ -18,7 +18,7 @@
 {% block content %}
 <div class="fluid-container">
     <div class="row">
-        <div class="col-md">
+        <div class="col-md-9">
             <h2>{{ place.name }}
                 {% if can_edit_place %}
                 <a href="{% url 'edit-place' place.id %}" class="btn btn-secondary btn-sm">Edit Place</a>
@@ -42,7 +42,7 @@
               height="400"
               frameborder="0" style="border:0"
               src="https://www.google.com/maps/embed/v1/place?key={{ settings.GOOGLE_MAPS_API_KEY }}
-                &q={{place.name}},{{place.city}}" allowfullscreen>
+               &q={{place.name}},{{place.city}}" allowfullscreen>
             </iframe>
 
         </div>
diff --git a/get_together/views/events.py b/get_together/views/events.py
index ed298fb..ec298b2 100644
--- a/get_together/views/events.py
+++ b/get_together/views/events.py
@@ -142,6 +142,8 @@ def add_place_to_event(request, event_id):
     elif request.method == 'POST':
         form = NewPlaceForm(request.POST)
         if form.is_valid:
+            if request.POST.get('id', None):
+                form.instance.id = request.POST.get('id')
             new_place = form.save()
             event.place = new_place
             event.save()