diff --git a/_config.yml b/_config.yml
index 1026074..deadf84 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,7 +3,6 @@
 # ----------------------- #
 
 url: http://blog.dsiw-it.de
-#url: http://dsiw.aquarius.uberspace.de/blog
 title: DSIW
 subtitle: Alles was interessant ist... (Linux, Programmierung, Datenschutz, Medien, uvm.)
 author: DSIW
@@ -35,10 +34,10 @@ destination: public
 plugins: plugins
 code_dir: downloads/code
 category_dir: categories
-category_title_prefix: "Kategorie: " 
-tag_title_prefix: Tag
+category_title_prefix: "Kategorie: "
+tag_title_prefix: "Tag: "
 tag_page_layout: tag_page
-tag_page_dir: tags
+tag_dir: tags
 markdown: rdiscount
 pygments: false # default python pygments have been replaced by pygments.rb
 markdown_ext: 'markdown,mkd,mkdn,md,octopress'
@@ -53,10 +52,6 @@ excerpt_link: "Weiterlesen &rarr;"  # "Continue reading" link text at the bottom
 titlecase: false       # Converts page and post titles to titlecase
 future: false
 
-# indextank settings
-#indextank_index: my_index
-#indextank_api_url: http://:myapikey@myapi.api.indextank.com
-
 # these values are applied as regular expressions
 indextank_excludes: [index.html, 404.html, ^/secret/]
 
diff --git a/plugins/related_posts.rb b/plugins/related_posts.rb
index 5085305..5a497d8 100644
--- a/plugins/related_posts.rb
+++ b/plugins/related_posts.rb
@@ -16,11 +16,12 @@ module RelatedPosts
     return [] unless posts.size > 1
     highest_freq = Jekyll::Post.tag_freq(posts).values.max
     related_scores = Hash.new(0)
-    posts.each do |post|
+    posts.clone.each do |post|
+      post = post.clone
       post.tags += post.categories - ['linux']
-      post.tags.each do |tag|
+      post.tags.uniq.each do |tag|
         if self.tags.include?(tag) && post != self
-          cat_freq = Jekyll::Post.tag_freq(posts)[tag]
+          cat_freq = Jekyll::Post.tag_freq(posts.clone)[tag]
           related_scores[post] += (1+highest_freq-cat_freq)
         end
       end
diff --git a/source/_includes/archive_post.html b/source/_includes/archive_post.html
index fef3328..45a0c79 100644
--- a/source/_includes/archive_post.html
+++ b/source/_includes/archive_post.html
@@ -4,5 +4,6 @@
 {% if category != '0' %}
 <footer>
   <span class="categories">posted in {{ post.categories | category_links }}</span>
+  <span class="categories">with {{ post.tags | tag_links }}</span>
 </footer>
 {% endif %}
diff --git a/source/_includes/post/categories.html b/source/_includes/post/categories.html
index 4a98b29..d75dcaa 100644
--- a/source/_includes/post/categories.html
+++ b/source/_includes/post/categories.html
@@ -1,4 +1,11 @@
-{% capture category %}{% if post %}{{ post.categories | category_links | size }}{% else %}{{ page.categories | category_links | size }}{% endif %}{% endcapture %}
+{% capture category %}
+  {% if post %}
+    {{ post.categories | category_links | size }}
+  {% else %}
+    {{ page.categories | category_links | size }}
+  {% endif %}
+{% endcapture %}
+
 {% unless category == '0' %}
 <span class="categories">
   {% if post %}
diff --git a/source/_includes/post/tags.html b/source/_includes/post/tags.html
index 4d265e9..190ba06 100644
--- a/source/_includes/post/tags.html
+++ b/source/_includes/post/tags.html
@@ -1,16 +1,17 @@
-{% capture tag %}{% if post %}{{ post.tags | tag_links | size }}{% else %}{{ page.tags | tag_links | size }}{% endif %}{% endcapture %}
+{% capture tag %}
+  {% if post %}
+    {{ post.tags | tag_links | size }}
+  {% else %}
+    {{ page.tags | tag_links | size }}
+  {% endif %}
+{% endcapture %}
+
 {% unless tag == '0' %}
-<div id="tag_list">
-  Tags: 
-  <ul id="tags_ul">
-    <!--{% if post %}-->
-      <!--{{ post.tags | tag_links }}-->
-    <!--{% else %}-->
-      <!--{{ page.tags | tag_links }}-->
-    <!--{% endif %}-->
-    {% for t in page.tags  %}
-      <li><a href="/tags/{{t}}/">{{t}}</a></li>
-    {% endfor %}
-  </ul>
-</div>
+<span class="categories">
+  {% if post %}
+    {{ post.tags | tag_links }}
+  {% else %}
+    {{ page.tags | tag_links }}
+  {% endif %}
+</span>
 {% endunless %}
diff --git a/source/_layouts/post.html b/source/_layouts/post.html
index d3c42e3..22c1557 100644
--- a/source/_layouts/post.html
+++ b/source/_layouts/post.html
@@ -11,6 +11,7 @@ single: true
       {% include post/author.html %}
       {% include post/date.html %}{% if updated %}{{ updated }}{% else %}{{ time }}{% endif %}
       {% include post/categories.html %}
+      {% include post/tags.html %}
     </p>
     {% unless page.sharing == false %}
       {% include post/sharing.html %}
