diff --git a/content/index.html b/content/index.html
index 20a2067c..389fdfb6 100644
--- a/content/index.html
+++ b/content/index.html
@@ -8,7 +8,7 @@ feed:
 -----
 <div class="row">
   <div class="span12">
-    <img src="/img/logo-klein.png" class="pull-right" />
+    <img src="/img/logo-klein.png" alt="CCCS-Logo" class="pull-right" />
     <h1>Herzlich willkommen beim CCC Stuttgart</h1>
     <p>
     <strong>Neu hier?</strong> Schau' doch bei <a href="/about/">unserer Beschreibung über uns</a>
diff --git a/layouts/default.html b/layouts/default.html
index f6c3d5ef..c3786c4e 100644
--- a/layouts/default.html
+++ b/layouts/default.html
@@ -54,13 +54,13 @@
       <% render("#{@item[:kind]}_body") do %><%= yield %><% end %>
       <div id="footer">
         <div id="footerimage">
-          <img src="/img/silhouette.png">
+          <img alt="Silhouette" src="/img/silhouette.png">
         </div>
         <footer>
           <ul class="horizontal">
             <li class="icon-twitter-sign"><a href="https://twitter.com/cccs_de/">twitter</a></li>
             <li class="icon-github"><a href="https://github.com/cccs/">github</a></li>
-            <li class="pull-right"><a href="/imprint">Impressum <img src="/img/cc-by-nc-sa-small.png" /></a></li>
+            <li class="pull-right"><a href="/imprint">Impressum <img alt="(CC) by-nc-sa" src="/img/cc-by-nc-sa-small.png" /></a></li>
           </ul>
         </footer>
       </div>
diff --git a/layouts/event_header.erb b/layouts/event_header.erb
index 7dfc1887..acfa1b0e 100644
--- a/layouts/event_header.erb
+++ b/layouts/event_header.erb
@@ -39,19 +39,22 @@
                     <% if @item[:location] %>
                     <li class="icon-compass commaseparated" title="Ort">
                       <ul itemprop="location" itemscope itemtype="http://schema.org/Location">
-                        <li itemprop="name"><% if item[:location][:url] %><a itemprop="url" href="<%= item[:location][:url] %>"><%= item[:location][:name] %></a><% else %><%= item[:location][:name] %><% end %>
-                        <% if item[:location][:details] %><li><%= item[:location][:details] %><% end %>
-                        <span itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
-                          <% if item[:location][:strasse] %><li itemprop="streetAddress"><%= item[:location][:strasse] %><% end %>
-                          <% if item[:location][:ort] %><li><span itemprop="postalCode"><%= item[:location][:plz] %></span> <span itemProp="addressLocality"><%= item[:location][:ort] %></span><% end %>
-                        </span>
+                        <li itemprop="name"><% if item[:location][:url] %><a itemprop="url" href="<%= item[:location][:url] %>"><%= item[:location][:name] %></a><% else %><%= item[:location][:name] %><% end %></li>
+                        <% if item[:location][:details] %><li><%= item[:location][:details] %></li><% end %>
+                        <li itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
+                          <ul class="commaseparated">
+                            <% if item[:location][:strasse] %><li itemprop="streetAddress"><%= item[:location][:strasse] %></li><% end %>
+                            <% if item[:location][:ort] %><li><span itemprop="postalCode"><%= item[:location][:plz] %></span> <span itemProp="addressLocality"><%= item[:location][:ort] %></span></li><% end %>
+                          </ul>
+                        </li>
                         <% if item[:location][:lon] %>
                         <li>
                           <span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
                             N<span itemprop="latitude"><%= item[:location][:lat] %></span>
                             E<span itemprop="longitude"><%= item[:location][:lon] %></span>
                           </span>
-                          (<a itemprop="map" href="http://www.openstreetmap.org/?mlat=<%= item[:location][:lat] %>&mlon=<%= item[:location][:lon] %>&zoom=18#map=16/<%= item[:location][:lat] %>/<%= item[:location][:lon] %>">Karte</a>)
+                          (<a itemprop="map" href="http://www.openstreetmap.org/?mlat=<%= item[:location][:lat] %>&amp;mlon=<%= item[:location][:lon] %>&amp;zoom=18#map=16/<%= item[:location][:lat] %>/<%= item[:location][:lon] %>">Karte</a>)
+                        </li>
                         <% end %>
                       </ul>
                     </li>