diff --git a/assets/css/screen.css b/assets/css/screen.css
index fe9ad0f..c13168b 100644
--- a/assets/css/screen.css
+++ b/assets/css/screen.css
@@ -355,7 +355,7 @@ table.plain {
     margin-bottom: 5rem;
     text-align: center;
     color: #fff;
-    background: #303538 url(http://f.cl.ly/items/1N2205280l2u1l0h190o/bg.jpg) no-repeat center center;
+    background: #303538 no-repeat center center;
     background-size: cover;
 }
 
diff --git a/index.hbs b/index.hbs
index c774200..a7290e4 100644
--- a/index.hbs
+++ b/index.hbs
@@ -4,7 +4,7 @@
     the {body} of the default.hbs template, which contains our header/footer. }}
 
 {{! The big featured header on the homepage, with the site logo and description }}
-<header id="site-head">
+<header id="site-head" {{! style="background-image: url()" }}>
     <div class="vertical">
         <div id="site-head-content" class="inner">
             {{#if settings.logo}}<a id="blog-logo" href="{{settings.url}}"><img src="{{settings.logo}}" alt="Blog Logo" /></a>{{/if}}
diff --git a/post.hbs b/post.hbs
index 1a5485e..a1cb73e 100644
--- a/post.hbs
+++ b/post.hbs
@@ -4,16 +4,22 @@
     the {body} of the default.hbs template, which contains our header/footer. }}
 
 <main class="content" role="main">
-    
-    {{! Everything inside the #post tags is the template used to ourput the post }}
-    {{#post}}
 
     <article class="{{post_class}}">
         
-        {{! Each post has the blog logo at the top, with a link back to the homage page }}
+        {{! Each post has the blog logo at the top, with a link back to the home page }}
         <header class="post-header">
-            <a id="blog-logo" href="{{../settings.url}}"><img src="assets/img/user.png" alt="" /></a>
+            <a id="blog-logo" href="{{settings.url}}">
+                {{#if settings.logo}}
+                    <img src="{{settings.logo}}" alt="Blog Logo" />
+                {{else}}
+                    {{settings.title}}
+                {{/if}}
+            </a>
         </header>
+
+        {{! Everything inside the #post tags pulls data from the post }}
+        {{#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>
@@ -25,20 +31,25 @@
         </section>
 
         <footer class="post-footer">
-            <section class="author">
-                <h4>John O'Nolan</h4>
-                <p>A designer, developer and entrepreneur. Spends his time travelling the world with a bag of kites. Likes journalism and publishing platforms.</p>
-            </section>
+
+            {{#if author}}
+                <section class="author">
+                    <h4>{{author}}</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={{settings.url}}/{{slug}}"><span class="hidden">Twitter</span></a>
                 <a class="icon-facebook" href="http://www.facebook.com/sharer.php?u={{settings.url}}/{{slug}}"><span class="hidden">Twitter</span></a>
                 <a class="icon-google-plus" href="#"><span class="hidden">Twitter</span></a>
             </section>
+
         </footer>
 
+        {{/post}}
+
     </article>
 
-    {{/post}}
-
 </main>
\ No newline at end of file