diff --git a/eventplanner/templates/eventplanner/events_grid.html b/eventplanner/templates/eventplanner/events_grid.html
index 69209fe..de0b666 100644
--- a/eventplanner/templates/eventplanner/events_grid.html
+++ b/eventplanner/templates/eventplanner/events_grid.html
@@ -28,6 +28,8 @@
 	 		
 	 		.with_comment {
 	 			font-style:  italic;
+                font-weight: 900;
+                font-size: 11px;
 	 		}
 	 		.usernameHeader {
 	 			font-size:10px;
@@ -210,11 +212,16 @@
 												<span class="badge badge-important eventButton"  title="{{p.comment}}" data-status="{{p.status}}">
 													<span class="text {% if p.comment %}with_comment{% endif %}">Nein</span>
 												</span>
-											{% else %}
+											{% elif p.status == "?" %}
 												<span class="badge badge-warning eventButton" title="{{p.comment}}" data-status="{{p.status}}">
 													<span class="text {% if p.comment %}with_comment{% endif %}">?</span>
 												</span>
+                                            {% else %}
+												<span class="badge eventButton" title="{{p.comment}}" data-status="{{p.status}}">
+													<span class="text {% if p.comment %}with_comment{% endif %}">-</span>
+												</span>
 											{% endif %}
+
 										</td> 
 									{% endif %}
 									
diff --git a/eventplanner_gcal/google_sync.py b/eventplanner_gcal/google_sync.py
index 491109b..4da7eb2 100644
--- a/eventplanner_gcal/google_sync.py
+++ b/eventplanner_gcal/google_sync.py
@@ -108,10 +108,17 @@ def buildGCalEvent( event, timezone="Europe/Berlin" ):
     else:
         endTime = datetime.time( 22, 30 )
 
+    gLocation = unicode(event.location)
+    if event.map_location:
+        # Map location has the following format: latitude,longitude,zoomlevel
+        # the first two are needed
+        s = event.map_location.split(",")
+        gLocation = unicode ( "%s,%s" % (s[0],s[1] ) )
+
     return {
         'summary':     unicode(settings.GCAL_COUPLING['eventPrefix'] + event.title),
         'description': unicode(event.desc),
-        'location':    unicode(event.location),
+        'location':    gLocation,
         'start': createDateTimeObj( startDate, startTime ),
         'end'  : createDateTimeObj( endDate,   endTime   ),
         'extendedProperties': {
diff --git a/eventplanner_gcal/management/commands/gcal_checkSubscription.py b/eventplanner_gcal/management/commands/gcal_check_subscription.py
similarity index 100%
rename from eventplanner_gcal/management/commands/gcal_checkSubscription.py
rename to eventplanner_gcal/management/commands/gcal_check_subscription.py
diff --git a/eventplanner_gcal/management/commands/gcal_stopSubscriptions.py b/eventplanner_gcal/management/commands/gcal_stop_subscriptions.py
similarity index 100%
rename from eventplanner_gcal/management/commands/gcal_stopSubscriptions.py
rename to eventplanner_gcal/management/commands/gcal_stop_subscriptions.py
diff --git a/eventplanner_gcal/static/img/screenshot.png b/eventplanner_gcal/static/img/screenshot.png
new file mode 100644
index 0000000..d592900
Binary files /dev/null and b/eventplanner_gcal/static/img/screenshot.png differ
diff --git a/eventplanner_gcal/templates/eventplanner_gcal/management.html b/eventplanner_gcal/templates/eventplanner_gcal/management.html
index d1aa058..4983bac 100644
--- a/eventplanner_gcal/templates/eventplanner_gcal/management.html
+++ b/eventplanner_gcal/templates/eventplanner_gcal/management.html
@@ -68,11 +68,22 @@
                     <h5>NEU</h5>
                     Die Blechreiz Termine können jetzt automatisch in den eigenen Google Kalender übernommen werden.
                     Auch vom Google Kalender aus kann man sich dann für Termine eintragen, direkt vom Handy oder Tablet aus.
+                    Die Termine werden automatisch in den eigenen Kalender übernommen. Das Eintragen fällt leichter
+                    weil man alle anderen eigenen Termine auch im Blick hat.
                 </p>
 
+                 <img src="{{STATIC_URL}}/img/screenshot.png">
+
                 <p>
                     <h5>SO GEHTS:</h5>
                     Einfach die eigene Google Mail Adresse angeben und die Kopplung aktivieren.
+                    <br>
+                    Achtung: Beim Kalender wird zwischen der Endung <em>@googlemail.com</em> und der
+                    Endung <em>@gmail.com</em> unterschieden ( bei Emails macht es keinen Unterschied, egal welche Endung,
+                    alle kommen an). <br>
+                    Um herauszufinden was die richtige Endung ist, meldet man sich
+                    <a href="https://www.google.com/calendar/" target="_blank">hier</a> an und öffnet die Einstellungen des eigenen Kalenders
+                    (in der Leiste links, unter "Meine Kalender" aufs Dreieck neben dem eigenen Kalender klicken).
                 </p>
 
 
@@ -99,11 +110,15 @@
                     {% endif %}
 
                 </form>
+
+
             </div>
 
             <div class="span3 offset1">
                 <img src="{{STATIC_URL}}/img/google_cal.png">
+
             </div>
+
         </div>
     </div>