diff --git a/Gruntfile.js b/Gruntfile.js
index b781692..a197524 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,7 +17,7 @@ require('load-grunt-tasks')(grunt);
       },
 
       jekyll: {
-        files: ['index.html', '_includes/*.html', 'filters/*.*',  '_layouts/*.*', '_posts/*.*'],
+        files: ['index.html', '_includes/*.html', '_filters/*.*',  '_layouts/*.*', '_posts/*.*'],
         tasks: ['shell:jekyllBuild']
       }
 
@@ -71,6 +71,5 @@ require('load-grunt-tasks')(grunt);
   grunt.loadNpmTasks('grunt-postcss');
   grunt.loadNpmTasks('grunt-concurrent');
 
-  // grunt.registerTask('default', ['shell:jekyllServe', 'watch']);
   grunt.registerTask('default', ['concurrent']);
 };
diff --git a/_filters/replace.md b/_filters/replace.md
index e661be3..1fe088b 100644
--- a/_filters/replace.md
+++ b/_filters/replace.md
@@ -5,5 +5,5 @@ title: replace
 Replaces every occurrence of a given string.
 
 | Code                                                   | Output             |
-|-------------------------------------------------------:|:-------------------|
+|:-------------------------------------------------------|:-------------------|
 | {% raw %}`{{ 'hello, hello world' | replace: 'hello', 'goodbye' }}`{% endraw %}     | `goodbye, goodbye world` |
diff --git a/_layouts/default.html b/_layouts/default.html
index bd1fec8..118c29d 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -38,11 +38,17 @@
         {% endfor %}
       </nav>
     </div>
-    <div class="content">
-      <div class="wrapper">
-        <h1>{{ page.title }}</h1>
-        {{ content }}
+
+    <div class="content__area">
+      <div class="content__wrapper">
+        <h1>{% unless page.url == "/index.html" %}{{ page.collection | capitalize }} &rarr; {% endunless %} {{ page.title }}</h1>
+        <div class="content">
+          {{ content }}
+        </div>
+        <a href="{{ page.previous }}">Previous </a>
+        <a href="{{ page.next }}">Next </a>
       </div>
     </div>
+
   </body>
 </html>
diff --git a/_sass/modules/_layout.scss b/_sass/modules/_layout.scss
index 22720e7..b584c75 100644
--- a/_sass/modules/_layout.scss
+++ b/_sass/modules/_layout.scss
@@ -7,12 +7,12 @@ $wrapper-width: 800px;
   Content Area
  ==============================================================================*/
 
-.content {
+.content__area {
   padding: $spacing-unit $spacing-unit $spacing-unit ($spacing-unit + $sidebar-width);
   width: 100%;
 }
 
-.wrapper {
+.content__wrapper {
   max-width: $wrapper-width;
   margin: 0 auto;
   padding: 0 $spacing-unit;