diff --git a/hyde/layouts/basic/content/blog/angry-post.html b/hyde/layouts/basic/content/blog/angry-post.html
index 738f8c6..2bbf111 100644
--- a/hyde/layouts/basic/content/blog/angry-post.html
+++ b/hyde/layouts/basic/content/blog/angry-post.html
@@ -5,7 +5,7 @@ description: >
 created: !!timestamp '2011-01-01 10:00:00'
 tags:
     - angry
-    - thougts
+    - thoughts
 ---
 
 --- mark image
diff --git a/hyde/layouts/basic/content/blog/happy-post.html b/hyde/layouts/basic/content/blog/happy-post.html
index d18d945..4628fdb 100644
--- a/hyde/layouts/basic/content/blog/happy-post.html
+++ b/hyde/layouts/basic/content/blog/happy-post.html
@@ -5,7 +5,7 @@ description: >
 created: !!timestamp '2011-02-01 10:00:00'
 tags:
     - happy
-    - thougts
+    - thoughts
 ---
 
 --- mark image
diff --git a/hyde/layouts/basic/content/blog/index.html b/hyde/layouts/basic/content/blog/index.html
index 04ba0d7..7ad96c1 100644
--- a/hyde/layouts/basic/content/blog/index.html
+++ b/hyde/layouts/basic/content/blog/index.html
@@ -1,5 +1,5 @@
 ---
-title: The Basic blog
+title: A basic blog
 extends: listing.j2
 default_block: test
 listable: false
diff --git a/hyde/layouts/basic/content/blog/sad-post.html b/hyde/layouts/basic/content/blog/sad-post.html
index 57612cb..d6739e4 100644
--- a/hyde/layouts/basic/content/blog/sad-post.html
+++ b/hyde/layouts/basic/content/blog/sad-post.html
@@ -5,7 +5,7 @@ description: >
 created: !!timestamp '2010-12-01 10:00:00'
 tags:
     - sad
-    - thougts
+    - thoughts
 ---
 
 --- mark image
diff --git a/hyde/layouts/basic/content/media/css/site.css b/hyde/layouts/basic/content/media/css/site.css
index 8cee2d9..9bda7d0 100644
--- a/hyde/layouts/basic/content/media/css/site.css
+++ b/hyde/layouts/basic/content/media/css/site.css
@@ -70,9 +70,84 @@ body{
       -ms-filter: "progid:DXImageTransform.Microsoft.dropshadow(OffX=12px, OffY=12px, Color='#ccc')"; /* IE8 */
 }
 
+footer{
+    font-size: 10px;
+    text-align: center;
+    margin-top: 24px;
+    text-shadow: 0px 2px 0px #fff;
+}
+
+/* Button styles from the awesome: http://www.webdesignerwall.com/demo/css-buttons.html */
+
+.button {
+    display: inline-block;
+    zoom: 1; /* zoom and *display = ie7 hack for display:inline-block */
+    *display: inline;
+    vertical-align: baseline;
+    margin: 0 2px;
+    outline: none;
+    cursor: pointer;
+    text-align: center;
+    text-decoration: none;
+    font: 14px/100% Arial, Helvetica, sans-serif;
+    padding: .5em 2em .55em;
+    text-shadow: 0 1px 1px rgba(0,0,0,.3);
+    -webkit-border-radius: .5em;
+    -moz-border-radius: .5em;
+    border-radius: .5em;
+    -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2);
+    -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2);
+    box-shadow: 0 1px 2px rgba(0,0,0,.2);
+}
+.button:hover {
+    text-decoration: none;
+}
+.button:active {
+    position: relative;
+    top: 1px;
+}
+
+.bigrounded {
+    -webkit-border-radius: 2em;
+    -moz-border-radius: 2em;
+    border-radius: 2em;
+}
+.medium {
+    font-size: 12px;
+    padding: .4em 1.5em .42em;
+}
+.small {
+    font-size: 11px;
+    padding: .2em 1em .275em;
+}
+
+
+/* white */
+.white {
+    color: #606060;
+    border: solid 1px #b7b7b7;
+    background: #fff;
+    background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed));
+    background: -moz-linear-gradient(top,  #fff,  #ededed);
+    filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed');
+}
+.white:hover {
+    background: #ededed;
+    background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#dcdcdc));
+    background: -moz-linear-gradient(top,  #fff,  #dcdcdc);
+    filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#dcdcdc');
+}
+.white:active {
+    color: #999;
+    background: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
+    background: -moz-linear-gradient(top,  #ededed,  #fff);
+    filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#ffffff');
+}
+
 .banner{
-    border-bottom: 12px solid #ccc;
+    border-bottom: 12px solid #222;
     padding: 0 12px;
+    position: relative;
 }
 
 .banner h1{
@@ -81,6 +156,7 @@ body{
     line-height: 48px;
 }
 
+
 .banner h3{
     color: #666;
     font-weight: normal;
@@ -89,6 +165,31 @@ body{
     margin-bottom: 12px;
 }
 
+.banner nav{
+    position: absolute;
+    right: 0;
+    bottom: 0;
+}
+
+.banner nav li{
+    list-style-type: none;
+    float: left;
+}
+
+.banner nav li a.button{
+    margin:0;
+    -webkit-border-bottom-left-radius: 0;
+    -webkit-border-bottom-right-radius: 0;
+    -moz-border-radius-bottomleft: 0;
+    -moz-border-radius-bottomright: 0;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.banner nav li a.button:hover{
+    color: #000;
+}
+
 h1.title{
     font-size: 24px;
     line-height: 36px;
@@ -158,34 +259,78 @@ section.content{
 /* Content */
 
 
-article.post h1{
-    margin-bottom: 24px;
-}
-
 article.post p{
-
     font-size: 12px;
     line-height: 24px;
     margin: 6px 0;
 }
 
-
 article.post img{
 
     display: block;
     margin-bottom: 24px;
 }
 
+ul.tags{
+    margin-bottom: 24px;
+    text-align: right;
+}
+
+ul.tags li{
+    list-style-type: none;
+    display: inline;
+}
+
+ul.tags li a{
+    color: #999;
+    text-decoration: none;
+}
+
+ul.tags li a:before{
+    content: '\00AB';
+}
+
+ul.tags li a:after{
+    content: '\00BB';
+}
+
+ul.tags li a:hover{
+    color: #222;
+}
 
 h1 a, h2 a, h3 a{
     text-decoration: none;
 }
 
+nav.post_nav{
+    position: relative;
+    font-size: 12px;
+    margin-bottom: 12px;
+}
+
 a.backlink:before{
     content: '\2190';
 }
 
-a.backlink{
+a.prev:before{
+    content: '\00AB';
+}
+
+a.next:after{
+    content: '\00BB';
+}
+
+a.prev{
+    position: absolute;
+    right: 96px;
+}
+
+a.next{
+    position: absolute;
+    right: 0;
+}
+
+.post_nav a{
     text-decoration: none;
     text-shadow: 0px 2px 0px #fff;
 }
\ No newline at end of file
diff --git a/hyde/layouts/basic/layout/base.j2 b/hyde/layouts/basic/layout/base.j2
index 5b04ab9..71dadcc 100644
--- a/hyde/layouts/basic/layout/base.j2
+++ b/hyde/layouts/basic/layout/base.j2
@@ -59,17 +59,43 @@
             <h1>BASIC</h1>
             <h3>A hyde website</h3>
           {%- endblock %}
+          {% block nav %}
+            <nav>
+                <ul>
+                    <li>
+                        <a class="button white" href="{{ content_url('index.html') }}">
+                            Home
+                        </a>
+                    </li>
+                    <li>
+                        <a class="button white" href="{{ content_url('portfolio') }}">
+                            Portfolio
+                        </a>
+                    </li>
+                    <li>
+                        <a class="button white" href="{{ content_url('blog') }}">
+                            Blog
+                        </a>
+                    </li>
+                    <li>
+                        <a class="button white" href="{{ content_url('about.html') }}">
+                            About
+                        </a>
+                    </li>
+                </ul>
+            </nav>
+          {% endblock %}
           </header>
           <section class="content">
           {% block main %}
           {% endblock main %}
           </section>
       </div>
-      <footer>
-          Powered by <a href="http://ringce.com/hyde">hyde</a>.
-      </footer>
     {% endblock container %}
   </div> <!--! end of #container -->
+  <footer>
+      Powered by <a href="http://ringce.com/hyde">hyde</a>.
+  </footer>
   {% endblock content%}
   {% block js %}
   <!-- Javascript at the bottom for fast page loading -->
diff --git a/hyde/layouts/basic/layout/blog.j2 b/hyde/layouts/basic/layout/blog.j2
index 3e2f29e..8050d22 100644
--- a/hyde/layouts/basic/layout/blog.j2
+++ b/hyde/layouts/basic/layout/blog.j2
@@ -2,12 +2,39 @@
 
 {% block main -%}
 <article class="post">
+<nav class="post_nav">
 <a class="backlink" href="{{ content_url(resource.node.url) }}">Back to list</a>
+{% if resource.prev_by_time %}
+<a class="prev"
+    title="{{ resource.prev_by_time.meta.title }}"
+    href="{{ content_url(resource.prev_by_time.url) }}">
+    Previous
+</a>
+{% endif %}
+
+{% if resource.next_by_time %}
+<a class="next"
+    title="{{ resource.next_by_time.meta.title }}"
+    href="{{ content_url(resource.next_by_time.url) }}">
+    Next
+</a>
+{% endif %}
+
+</nav>
 <h1 class="title">
     <a href="{{ content_url(resource.url) }}">
         {{ resource.meta.title }}
     </a>
 </h1>
+{% if resource.meta.tags %}
+<ul class="tags clear">
+{% for tag in resource.meta.tags %}
+<li>
+    <a class="small">{{ tag }}</a>
+</li>
+{% endfor %}
+</ul>
+{% endif %}
 {% filter markdown|typogrify -%}
 
 {% block post -%}{%- endblock %}