diff --git a/default.hbs b/default.hbs
index d8163f4..35f1f6c 100644
--- a/default.hbs
+++ b/default.hbs
@@ -32,12 +32,12 @@
              <section class="poweredby">Proudly published with <a class="icon-ghost" href="http://tryghost.org">Ghost</a></section>
         </div>
     </footer>
-    
-    {{! The main JavaScript file for Casper }}
-    <script type="text/javascript" src="assets/js/index.js"></script>
 
     {{! Ghost outputs important scripts and data with this tag }}
     {{ghost_foot}}
 
+    {{! The main JavaScript file for Casper }}
+    <script type="text/javascript" src="assets/js/index.js"></script>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/index.hbs b/index.hbs
index 9632632..2a400d2 100644
--- a/index.hbs
+++ b/index.hbs
@@ -20,11 +20,11 @@
 
     {{! Each post will be output using this markup }}
     {{#foreach posts}}
-    
+
     <article class="{{post_class}}">
         <header class="post-header">
-            <span class="post-meta"><time datetime="{{date published_at format='YYYY-MM-DD'}}">{{date published_at format="DD MMM YYYY"}}</time> {{#if tags}}on {{tags}}{{/if}}</span>
-            <h2 class="post-title"><a href="/{{slug}}">{{title}}</a></h2>
+            <span class="post-meta"><time datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMM YYYY"}}</time> {{#if tags}}on {{tags}}{{/if}}</span>
+            <h2 class="post-title"><a href="{{url}}">{{title}}</a></h2>
             
         </header>
         <section class="post-excerpt">
diff --git a/post.hbs b/post.hbs
index a273a47..13def5f 100644
--- a/post.hbs
+++ b/post.hbs
@@ -22,7 +22,7 @@
         {{#post}}
         
         {{! Everything below outputs content of the the post which has been published }}
-        <span class="post-meta"><time datetime="{{date published_at format="YYYY-MM-DD"}}">{{date published_at format='DD MMM YYYY'}}</time> {{#if tags}}on {{tags}}{{/if}}</a></span>
+        <span class="post-meta"><time datetime="{{date format="YYYY-MM-DD"}}">{{date format='DD MMM YYYY'}}</time> {{#if tags}}on {{tags}}{{/if}}</span>
 
         <h1 class="post-title">{{title}}</h1>
 
@@ -34,16 +34,16 @@
 
             {{#if author}}
                 <section class="author">
-                    <h4>{{author}}</h4>
+                    <h4>{{author.name}}</h4>
                     <p>{{author.bio}}</p>
                 </section>
             {{/if}}
 
             <section class="share">
                 <h4>Share this post</h4>
-                <a class="icon-twitter" href="http://twitter.com/share?text={{title}}&url={{@blog.url}}/{{slug}}"><span class="hidden">Twitter</span></a>
-                <a class="icon-facebook" href="http://www.facebook.com/sharer.php?u={{@blog.url}}/{{slug}}"><span class="hidden">Twitter</span></a>
-                <a class="icon-google-plus" href="#"><span class="hidden">Twitter</span></a>
+                <a class="icon-twitter" href="http://twitter.com/share?text={{title}}&url={{url absolute}}"><span class="hidden">Twitter</span></a>
+                <a class="icon-facebook" href="http://www.facebook.com/sharer.php?u={{url absolute}}"><span class="hidden">Facebook</span></a>
+                <a class="icon-google-plus" href="#"><span class="hidden">Google+</span></a>
             </section>
 
         </footer>