diff --git a/_src/_includes/index.html b/_src/_includes/index.html
index 50985f69..7d7fe808 100644
--- a/_src/_includes/index.html
+++ b/_src/_includes/index.html
@@ -4,7 +4,10 @@
     <article class="hentry format-link">
     	<header>
     		<h1 class="entry-title">
-                <a href="{{ post.linkurl }}" title="Go to source">{{ post.title }} <i class="icon-forward"></i></a>
+                <a href="{{ post.linkurl }}" title="Go to source">
+                    {{ post.title }} <i class="icon-forward"></i>
+                    <span class="linkurl">{{ post.linkurl | remove:'http://' | split:'/' | first }}</span>
+                </a>
             </h1>
     	</header>
 
diff --git a/_src/_layouts/link.html b/_src/_layouts/link.html
index 1fa6b365..1ff3136c 100644
--- a/_src/_layouts/link.html
+++ b/_src/_layouts/link.html
@@ -7,7 +7,10 @@ layout: base
     <article class="hentry format-link">
     	<header>
     		<h1 class="entry-title">
-                <a href="{{ page.linkurl }}" title="Go to source">{{ page.title }} <i class="icon-forward"></i></a>
+                <a href="{{ post.linkurl }}" title="Go to source">
+                    {{ page.title }} <i class="icon-forward"></i>
+                    <span class="linkurl">{{ page.linkurl | remove:'http://' | split:'/' | first }}</span>
+                </a>
             </h1>
     	</header>
 
@@ -20,11 +23,6 @@ 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>
diff --git a/_src/_layouts/photo.html b/_src/_layouts/photo.html
index 00ebd26e..56b3d309 100644
--- a/_src/_layouts/photo.html
+++ b/_src/_layouts/photo.html
@@ -21,11 +21,6 @@ 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>
diff --git a/_src/_layouts/post.html b/_src/_layouts/post.html
index e930f7f9..4047d893 100644
--- a/_src/_layouts/post.html
+++ b/_src/_layouts/post.html
@@ -18,11 +18,6 @@ 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>
     		<div class="time">
     		    <p>{{ page.date | date_to_string }}</p>
diff --git a/_src/assets/less/content.less b/_src/assets/less/content.less
index 0373f9e7..c5520c3b 100644
--- a/_src/assets/less/content.less
+++ b/_src/assets/less/content.less
@@ -76,8 +76,25 @@
     
 }
 
+.linkurl {
+    display: block;
+    font-family: @font-family-base;
+    font-size: @font-size-mini;
+    color: @text-color-dimmed;
+    padding: @line-height-computed/3 0;
+    margin-left: auto;
+    margin-right: auto;
+    .ellipsis;
+    
+    max-width: 70%;
+    @media @breakpoint2 {
+        max-width: 50%;
+    }
+}
+
 .permalink-link {
 	float: right;
+    font-size: 1.1em
 }
 
 // PHOTO POST
@@ -148,45 +165,25 @@ a.photoPost {
     .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-mini;
-        
-        p { margin-bottom: 0; }
-        
-        @media @breakpoint2 {
-            text-align: right;
-        }
-	}
+    text-align: center;
+}
+
+.byline,
+.time {
+	font-style: italic;
+	color: @text-color-light;
 }
 
 .byline {
 	margin-bottom: 0;
-    
-    
-    @media @breakpoint2 {
-        margin-top: -@line-height-computed*3;
-    }
 	
 	a { font-style: normal; }
+    .by { display: block }
 }
 
-.by { display: block }
-
-.category {
-    .heading-band;
-    
-    a { margin-right: 1em }
-}
-
+.time,
 .modtime {
-    
+    color: @text-color-dimmed
 }
 
 
diff --git a/_src/assets/less/mixins.less b/_src/assets/less/mixins.less
index f5330fca..764fd1eb 100644
--- a/_src/assets/less/mixins.less
+++ b/_src/assets/less/mixins.less
@@ -26,6 +26,15 @@
 	li { color: @text-color-dimmed; }
 }
 
+// Text overflow
+/////////////////////////////////////
+
+.ellipsis {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+	overflow: hidden
+}
+
 // Dashed Dividers
 /////////////////////////////////////