diff --git a/layouts/article_archive.erb b/layouts/article_archive.erb
index 53745501..0d74f994 100644
--- a/layouts/article_archive.erb
+++ b/layouts/article_archive.erb
@@ -1,12 +1,14 @@
 <%= render 'pager', :linkprev => @linkprev, :linknext => @linknext %>
 <div class="row">
-  <% @item[:archiveitems].each do |item| %>
-  <div class="span8">
-  <%= render 'item_intro', :item => item, :extended => true %>
-   <p>
-   <a itemprop="blogPost" href="<%= item.path() %>">Zum Artikel</a>
-   <hr>
-  </div>
-  <% end %>
+  <section itemscope itemtype="http://schema.org/Blog">
+    <% @item[:archiveitems].each do |item| %>
+    <div class="span8">
+    <%= render 'item_intro', :item => item, :extended => true %>
+     <p>
+     <a itemprop="blogPost" href="<%= item.path() %>">Zum Artikel</a>
+     <hr>
+    </div>
+    <% end %>
+  </section>
 </div>
 <%= render 'pager', :linkprev => @linkprev, :linknext => @linknext %>
diff --git a/layouts/project_body.html b/layouts/project_body.html
index c0f6f01a..6b361c62 100644
--- a/layouts/project_body.html
+++ b/layouts/project_body.html
@@ -2,16 +2,18 @@
         <div class="span8">
           <div class="row">
             <div class="span8">
-             <h1><%= item[:title] %></h1>
-             <%= yield %>
-           </div>
-           <% latest_articles_referred_to(item.identifier,5).each do |item| %>
-           <div class="span8">
-           <%= render 'item_intro', :item => item, :extended => true %>
-             <p>
-             <a itemprop="blogPost" href="<%= item.path() %>">Zum Artikel</a>
-           </div>
-           <% end %>
+              <h1><%= item[:title] %></h1>
+              <%= yield %>
+            </div>
+            <section itemscope itemtype="http://schema.org/Blog">
+              <% latest_articles_referred_to(item.identifier,5).each do |item| %>
+              <div class="span8">
+              <%= render 'item_intro', :item => item, :extended => true %>
+                <p>
+                <a itemprop="blogPost" href="<%= item.path() %>">Zum Artikel</a>
+              </div>
+              <% end %>
+            </section>
           </div>
         </div>
         <div class="span4">
diff --git a/lib/twitterhelpers.rb b/lib/twitterhelpers.rb
index d266ef8f..366b92fa 100644
--- a/lib/twitterhelpers.rb
+++ b/lib/twitterhelpers.rb
@@ -21,7 +21,7 @@ def tweet_to_html(tweet)
   end
   result = html_escape(result)
   links.each_with_index do |link,n|
-    result.gsub!("{{{link#{n}}}}", "<a href=\"#{link}\">(Link)</a>")
+    result.gsub!("{{{link#{n}}}}", "<a href=\"#{html_escape(link)}\">(Link)</a>")
   end
   return result
 end