diff --git a/_config.yml b/_config.yml
index 5bf1b2575a..175f9128c1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -92,8 +92,8 @@ delicious_user:
 delicious_count: 3
 
 # Disqus Comments
-disqus_short_name:
-disqus_show_comment_count: false
+disqus_short_name: home-assistant
+disqus_show_comment_count: true
 
 # Google Analytics
 google_analytics_tracking_id: UA-57927901-1
diff --git a/sass/oscailte/base/_post.scss b/sass/oscailte/base/_post.scss
index 2b577fbe4d..e2805bd191 100644
--- a/sass/oscailte/base/_post.scss
+++ b/sass/oscailte/base/_post.scss
@@ -69,8 +69,12 @@ article {
     $meta-color: $site-background;
     font-size: 12px;
     padding: 0 0 5px;
-    > time {
+    > * {
       margin-right: 20px;
+
+      &:last-child {
+        margin-right: 0;
+      }
     }
   }
 
diff --git a/source/_includes/blog/post/article.html b/source/_includes/blog/post/article.html
index 4aa799ec94..94b0bbcc86 100644
--- a/source/_includes/blog/post/article.html
+++ b/source/_includes/blog/post/article.html
@@ -10,9 +10,10 @@
   {% unless post.meta == false %}
   <div class="meta clearfix">
     {% include blog/post/date.html %}{{ time }}
+    {% include post/author.html %}
     {% include blog/post/tags.html %}
     {% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %}
-      <a class="pull-right" href="{% if index %}{{ site.url }}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">
+      <a class="pull-right" href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">
         Comments <i class="icon-comment"></i>
       </a>
     {% endif %}
diff --git a/source/_includes/blog/post/date.html b/source/_includes/blog/post/date.html
index cf91e6bad5..34b9384649 100644
--- a/source/_includes/blog/post/date.html
+++ b/source/_includes/blog/post/date.html
@@ -7,9 +7,9 @@
 {% capture was_updated %}{{ updated | size }}{% endcapture %}
 
 {% if has_date != '0' %}
-  {% capture time %}<time class="pull-left" datetime="{{ date | datetime | date_to_xmlschema }}" pubdate{% if updated %} data-updated="true"{% endif %}><i class="icon-calendar"></i> {{ date_formatted }}</time>{% endcapture %}
+  {% capture time %}<time datetime="{{ date | datetime | date_to_xmlschema }}" pubdate{% if updated %} data-updated="true"{% endif %}><i class="icon-calendar"></i> {{ date_formatted }}</time>{% endcapture %}
 {% endif %}
 
 {% if was_updated != '0' %}
-  {% capture updated %}<time class="pull-left" datetime="{{ updated | datetime | date_to_xmlschema }}" class="updated">Updated {{ updated_formatted }}</time>{% endcapture %}
+  {% capture updated %}<time datetime="{{ updated | datetime | date_to_xmlschema }}" class="updated">Updated {{ updated_formatted }}</time>{% endcapture %}
 {% else %}{% assign updated = false %}{% endif %}
\ No newline at end of file
diff --git a/source/_includes/blog/post/tags.html b/source/_includes/blog/post/tags.html
index d1a69de9a7..1c6cf175c1 100644
--- a/source/_includes/blog/post/tags.html
+++ b/source/_includes/blog/post/tags.html
@@ -1,6 +1,6 @@
 {% capture category %}{% if post %}{{ post.categories | category_links | size }}{% else %}{{ page.categories | category_links | size }}{% endif %}{% endcapture %}
 {% unless category == '0' %}
-  <div class="pull-left">
+  <span>
     <i class="icon-tags"></i>
     <ul class="tags unstyled">
     {% if post %}
@@ -13,5 +13,5 @@
       {% endfor %}
     {% endif %}
     </ul>
-  </div>
+  </span>
 {% endunless %}
\ No newline at end of file
diff --git a/source/_includes/post/author.html b/source/_includes/post/author.html
index 83dd6a89a7..96a10c510a 100644
--- a/source/_includes/post/author.html
+++ b/source/_includes/post/author.html
@@ -5,4 +5,4 @@
 {% else %}
   {% assign author = site.author %}
 {% endif %}
-{% if author %}<span class="byline author vcard">Posted by <span class="fn">{{ author }}</span></span>{% endif %}
+{% if author %}<span class="byline author vcard"><i class='icon-user'></i> {{ author }}</span>{% endif %}
diff --git a/source/_posts/2014-12-18-website-launched.markdown b/source/_posts/2014-12-18-website-launched.markdown
index b69e79741a..31e4e171b8 100644
--- a/source/_posts/2014-12-18-website-launched.markdown
+++ b/source/_posts/2014-12-18-website-launched.markdown
@@ -2,9 +2,10 @@
 layout: post
 title: "Website launched!"
 date: 2014-12-18 23:24:45 -0800
+date_formatted: "December 18, 2014"
 comments: true
 categories: website
-author: Paulus
+author: "Paulus Schoutsen"
 ---
 
 I finally took the time to setup a simple website to help people getting started with Home Assistant. The process was super smooth thanks to the great tools [Jekyll](http://jekyllrb.com) and [Octopress](http://octopress.org) and the great services [GitHub Pages](https://pages.github.com) and [CloudFlare](https://cloudflare.com).