diff --git a/_src/_layouts/image.html b/_src/_layouts/image.html
index cf4f7d42..fdbbae68 100644
--- a/_src/_layouts/image.html
+++ b/_src/_layouts/image.html
@@ -13,17 +13,18 @@ layout: base
     	</figure>
     </div>
     
-	<aside class="entry-meta">
-		<p class="byline author vcard source-org">by <a class="fn" rel="author" href="/about/">{{ page.author }}</a></p>
-		<p class="time">{{ page.date | date_to_string }}</p>
-	</aside>
-    
     <section class="entry-content">
         {{ content }}
     </section>
     
     <footer class="entry-meta">
-        
+        <p class="category">
+            {% for category in page.categories %}
+                <a rel="category tag" href="" title="{{ category }}">{{ category }}</a>
+            {% endfor %}
+        </p>
+		<p class="byline author vcard source-org"><span class="by">by</span> <a class="fn" rel="author" href="/about/">{{ page.author }}</a></p>
+		<p class="time">{{ page.date | date_to_string }} <span class="modtime"></span></p>
     </footer>
     
 </article>
\ No newline at end of file
diff --git a/_src/_layouts/link.html b/_src/_layouts/link.html
index 12fffebf..7dd79daf 100644
--- a/_src/_layouts/link.html
+++ b/_src/_layouts/link.html
@@ -8,11 +8,6 @@ layout: base
             <a href="{{ page.linkurl }}">{{ page.title }} <i class="icon-forward"></i></a>
         </h1>
 	</header>
-    
-	<aside class="entry-meta">
-		<p class="byline author vcard source-org">by <a class="fn" rel="author" href="/about/">{{ page.author }}</a></p>
-		<p class="time">{{ page.date | date_to_string }}</p>
-	</aside>
 
     <section class="entry-content">
         {{ content }}
@@ -23,6 +18,12 @@ layout: base
     </section>
     
     <footer class="entry-meta">
-        
+        <p class="category">
+            {% for category in page.categories %}
+                <a rel="category tag" href="" title="{{ category }}">{{ category }}</a>
+            {% endfor %}
+        </p>
+		<p class="byline author vcard source-org"><span class="by">by</span> <a class="fn" rel="author" href="/about/">{{ page.author }}</a></p>
+		<p class="time">{{ page.date | date_to_string }} <span class="modtime"></span></p>
     </footer>
 </article>
\ No newline at end of file
diff --git a/_src/_layouts/post.html b/_src/_layouts/post.html
index 0ed1652c..deafba8b 100644
--- a/_src/_layouts/post.html
+++ b/_src/_layouts/post.html
@@ -6,11 +6,6 @@ layout: base
 	<header>
 		<h1 class="entry-title">{{ page.title }}</h1>
 	</header>
-    
-	<aside class="entry-meta">
-		<p class="byline author vcard source-org">by <a class="fn" rel="author" href="/about/">{{ page.author }}</a></p>
-		<p class="time">{{ page.date | date_to_string }}</p>
-	</aside>
 
     <section class="entry-content">
         {% if page.image %}
@@ -21,10 +16,12 @@ layout: base
     </section>
     
     <footer class="entry-meta">
-        <p>
+        <p class="category">
             {% for category in page.categories %}
                 <a rel="category tag" href="" title="{{ category }}">{{ category }}</a>
             {% endfor %}
         </p>
+		<p class="byline author vcard source-org"><span class="by">by</span> <a class="fn" rel="author" href="/about/">{{ page.author }}</a></p>
+		<p class="time">{{ page.date | date_to_string }} <span class="modtime"></span></p>
     </footer>
 </article>
\ No newline at end of file
diff --git a/_src/_posts/2013-08-07-stealing-time-how-technology-can-hurt-or-harm-our-inner-state.markdown b/_src/_posts/2013-08-07-stealing-time-how-technology-can-hurt-or-harm-our-inner-state.markdown
index 930272a5..6f50d74d 100644
--- a/_src/_posts/2013-08-07-stealing-time-how-technology-can-hurt-or-harm-our-inner-state.markdown
+++ b/_src/_posts/2013-08-07-stealing-time-how-technology-can-hurt-or-harm-our-inner-state.markdown
@@ -3,7 +3,7 @@ layout: link
 
 title: 'Stealing Time: How Technology Can Hurt or Harm Our Inner State'
 linkurl: https://www.ezeep.com/blog/stealing-time-how-technology-can-hurt-or-harm-our-quality-of-life/
-author: Matthias Kretschmann Kretschmann
+author: Matthias Kretschmann
 
 date: 2013-08-07 17:05:58+00:00
 wordpress_id: 2472
diff --git a/_src/_posts/2013-11-17-welcome-to-jekyll.markdown b/_src/_posts/2013-11-17-welcome-to-jekyll.markdown
index f3acf724..0cc04997 100644
--- a/_src/_posts/2013-11-17-welcome-to-jekyll.markdown
+++ b/_src/_posts/2013-11-17-welcome-to-jekyll.markdown
@@ -1,7 +1,7 @@
 ---
 layout: post
 title:  "Welcome to Jekyll!"
-author: Matthias Kretschmann Kretschmann
+author: Matthias Kretschmann
 date:   2013-11-17 23:56:48
 categories:
 - jekyll
diff --git a/_src/assets/less/content.less b/_src/assets/less/content.less
index 0141aa38..75af1439 100644
--- a/_src/assets/less/content.less
+++ b/_src/assets/less/content.less
@@ -62,23 +62,44 @@
 /////////////////////////////////////
 
 .entry-meta {
-	text-align: center;
-	
+    .clearfix;
+    margin-top: @line-height-computed*2;
+    font-size: @font-size-small;
+    line-height: 1.3em;
+    text-align: left;
+    
 	.byline,
 	.time,
 	time {
 		font-style: italic;	
 		color: @text-color-light;
-		font-size: @font-size-small;
-		line-height: 1.4em
-	}
-	.byline {
-		margin-bottom: 0;
-		
-		a { font-style: normal; }
+		font-size: @font-size-mini;
+        
+        @media @breakpoint2 {
+            text-align: right;
+        }
 	}
 }
 
+.byline {
+	margin-bottom: 0;
+    
+    
+    @media @breakpoint2 {
+        margin-top: -@line-height-computed*3;
+    }
+	
+	a { font-style: normal; }
+}
+
+.by { display: block }
+
+.category {
+    .heading-band;
+    
+    a { margin-right: 1em }
+}
+
 
 // LINK POST
 /////////////////////////////////////