diff --git a/.gitmodules b/.gitmodules
index 1c9f545..f4b3b44 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "deps/Sanitize.js"]
 	path = deps/Sanitize.js
-	url = https://github.com/gbirke/Sanitize.js.git
+	url = https://github.com/thedod/Sanitize.js.git
 [submodule "deps/jwysiwyg"]
 	path = deps/jwysiwyg
 	url = https://github.com/akzhan/jwysiwyg.git
diff --git a/deps/Sanitize.js b/deps/Sanitize.js
new file mode 160000
index 0000000..a0bdb6f
--- /dev/null
+++ b/deps/Sanitize.js
@@ -0,0 +1 @@
+Subproject commit a0bdb6f9647d677273d83df678f494cb5852b42f
diff --git a/lib/lists.js b/lib/lists.js
index 87fab92..8da625c 100644
--- a/lib/lists.js
+++ b/lib/lists.js
@@ -8,6 +8,7 @@ exports.homepage = function (head, req) {
 
     start({code: 200, headers: {'Content-Type': 'text/html'}});
 
+    var title = config.site_name;
     // fetch all the rows
     var row, rows = [];
     while (row = getRow()) {
@@ -19,8 +20,14 @@ exports.homepage = function (head, req) {
         rows: rows
     });
 
-    return {title: config.site_name, config: config, content: content};
-
+    if (req.client) {
+        document.title = title;
+        $('#breadcrumbs').html('');
+        $('#content').html(content);
+        $('#actions').html(templates.render('blogposts_actions.html',req,{}));
+    } else {
+        return {title: title, config: config, content: content, breadcrumbs:''};
+    };
 };
 
 exports.carousel = function (head, req) {
diff --git a/lib/sanitize b/lib/sanitize
new file mode 120000
index 0000000..d88c150
--- /dev/null
+++ b/lib/sanitize
@@ -0,0 +1 @@
+../deps/Sanitize.js/lib
\ No newline at end of file
diff --git a/lib/shows.js b/lib/shows.js
index 8da1916..6478979 100644
--- a/lib/shows.js
+++ b/lib/shows.js
@@ -4,24 +4,47 @@
 
 var templates = require('kanso/templates'),
     forms = require('kanso/forms'),
+    utils = require('kanso/utils'),
     config = require('./config'),
     types = require('./types');
 
 exports.not_found = function (doc, req) {
+    start({code: 200, headers: {'Content-Type': 'text/html'}});
     return {
         title: config.site_name+" - Not found",
-        content: templates.render('404.html', req, {})
+        content: templates.render('404.html', req, {}),
+        breadcrumbs: 'Not found'
     };
 };
 
 exports.blogpost = function (doc, req) {
+  var title = config.site_name+' - '+doc.title;
+  var breadcrumbs = utils.escapeHTML(doc.title);
+  start({code: 200, headers: {'Content-Type': 'text/html'}});
+  if (req.client) {
+    document.title = title;
+    $('#breadcrumbs').html(breadcrumbs);
+    var cfg = require('./sanitize/sanitize_cfg_relaxed').Config;
+    // Add rel and target to all links
+    cfg.add_attributes={a:{rel:'nofollow', target:'_blank'}};
+    var Sanitize = require('./sanitize/sanitize').Sanitize;
+    var stz = new Sanitize(cfg);
+    // We need to defuse script tags before sanitizing, because $('<script/>') *would* execute
+    $('#content').html(stz.clean_node(
+        $('<span>'+doc.text.replace(/<script/gi,'&lt;script')+'</span>').get(0)
+    ));
+    $('#actions').html(templates.render('blogpost_actions.html',req,doc));
+  } else {
     doc.escaped = escape(doc.text);
-    doc.site_name = config.site_name;
     var content = templates.render('blogpost.html', req, doc);
-    return {title:config.site_name+' - '+doc.title, config: config, content:content}
+    return {title:title, config: config, content:content, breadcrumbs:breadcrumbs}
+  };
 };
 
 exports.add_blogpost = function (doc, req) {
+    var title = config.site_name + ' - Add new blogpost';
+    var breadcrumbs = 'Add new blogpost';
+    start({code: 200, headers: {'Content-Type': 'text/html'}});
     var form = new forms.Form(types.blogpost, null, {
         exclude: ['created']
     });
@@ -33,11 +56,26 @@ exports.add_blogpost = function (doc, req) {
         config: config,
         form: form.toHTML(req)
     });
-
-    return {title: config.site_name + ' - Add new blogpost', config: config, content: content};
+    if (req.client) {
+        document.title = title;
+        $('#content').html(content);
+        $('#breadcrumbs').html(breadcrumbs);
+        $('#actions').html(''); 
+	$('#id_title').focus();
+	$('#id_text').wysiwyg({
+                controls:window.wysiwyg_controls,
+                css: {direction: config.rtl ? 'rtl' : 'ltr'},
+                initialContent:''
+        });
+    } else {
+        return {title: title, config: config, content: content, breadcrumbs:breadcrumbs};
+    };
 };
 
 exports.edit_blogpost = function (doc, req) {
+    var title = config.site_name + ' - Edit blogpost - '+doc.title;
+    var breadcrumbs = '<a href="'+utils.getBaseURL(req)+'/'+doc._id+'">'+utils.escapeHTML(doc.title)+'</a> Edit';
+    start({code: 200, headers: {'Content-Type': 'text/html'}});
     var form = new forms.Form(types.blogpost, doc, {
         exclude: ['created']
     });
@@ -50,6 +88,18 @@ exports.edit_blogpost = function (doc, req) {
         config: config,
         form: form.toHTML(req)
     });
-
-    return {title: config.site_name + ' - Edit blogpost - '+doc.title, config: config, content: content};
+    if (req.client) {
+        document.title = title;
+        $('#breadcrumbs').html(breadcrumbs);
+        $('#content').html(content);
+        $('#actions').html(''); 
+	$('#id_title').focus();
+	$('#id_text').wysiwyg({
+                controls:window.wysiwyg_controls,
+                css: {direction: config.rtl ? 'rtl' : 'ltr'},
+                initialContent:''
+        });
+    } else {
+        return {title: title, config: config, content: content, breadcrumbs:breadcrumbs};
+    };
 };
diff --git a/static/js/sanitize_js b/static/js/sanitize_js
deleted file mode 120000
index ae387dd..0000000
--- a/static/js/sanitize_js
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/Sanitize.js/lib
\ No newline at end of file
diff --git a/static/jwysiwyg b/static/jwysiwyg
new file mode 120000
index 0000000..55cd111
--- /dev/null
+++ b/static/jwysiwyg
@@ -0,0 +1 @@
+../deps/jwysiwyg
\ No newline at end of file
diff --git a/static/jwysiwyg/CHANGES.markdown b/static/jwysiwyg/CHANGES.markdown
deleted file mode 120000
index 5edf344..0000000
--- a/static/jwysiwyg/CHANGES.markdown
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/CHANGES.markdown
\ No newline at end of file
diff --git a/static/jwysiwyg/GPL-LICENSE.txt b/static/jwysiwyg/GPL-LICENSE.txt
deleted file mode 120000
index 8435dff..0000000
--- a/static/jwysiwyg/GPL-LICENSE.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/GPL-LICENSE.txt
\ No newline at end of file
diff --git a/static/jwysiwyg/MIT-LICENSE.txt b/static/jwysiwyg/MIT-LICENSE.txt
deleted file mode 120000
index f33255c..0000000
--- a/static/jwysiwyg/MIT-LICENSE.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/MIT-LICENSE.txt
\ No newline at end of file
diff --git a/static/jwysiwyg/README.rst b/static/jwysiwyg/README.rst
deleted file mode 120000
index 06f856f..0000000
--- a/static/jwysiwyg/README.rst
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/README.rst
\ No newline at end of file
diff --git a/static/jwysiwyg/ajax-loader.gif b/static/jwysiwyg/ajax-loader.gif
deleted file mode 120000
index 93968cd..0000000
--- a/static/jwysiwyg/ajax-loader.gif
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/ajax-loader.gif
\ No newline at end of file
diff --git a/static/jwysiwyg/controls b/static/jwysiwyg/controls
deleted file mode 120000
index a1ca665..0000000
--- a/static/jwysiwyg/controls
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/controls
\ No newline at end of file
diff --git a/static/jwysiwyg/i18n b/static/jwysiwyg/i18n
deleted file mode 120000
index 844d530..0000000
--- a/static/jwysiwyg/i18n
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/i18n
\ No newline at end of file
diff --git a/static/jwysiwyg/index.html b/static/jwysiwyg/index.html
deleted file mode 120000
index 7864fc7..0000000
--- a/static/jwysiwyg/index.html
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/index.html
\ No newline at end of file
diff --git a/static/jwysiwyg/jquery.wysiwyg.bg.png b/static/jwysiwyg/jquery.wysiwyg.bg.png
deleted file mode 120000
index e11b814..0000000
--- a/static/jwysiwyg/jquery.wysiwyg.bg.png
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/jquery.wysiwyg.bg.png
\ No newline at end of file
diff --git a/static/jwysiwyg/jquery.wysiwyg.css b/static/jwysiwyg/jquery.wysiwyg.css
deleted file mode 120000
index 2e8bcbe..0000000
--- a/static/jwysiwyg/jquery.wysiwyg.css
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/jquery.wysiwyg.css
\ No newline at end of file
diff --git a/static/jwysiwyg/jquery.wysiwyg.gif b/static/jwysiwyg/jquery.wysiwyg.gif
deleted file mode 120000
index 3feb873..0000000
--- a/static/jwysiwyg/jquery.wysiwyg.gif
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/jquery.wysiwyg.gif
\ No newline at end of file
diff --git a/static/jwysiwyg/jquery.wysiwyg.jpg b/static/jwysiwyg/jquery.wysiwyg.jpg
deleted file mode 120000
index 1b972bc..0000000
--- a/static/jwysiwyg/jquery.wysiwyg.jpg
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/jquery.wysiwyg.jpg
\ No newline at end of file
diff --git a/static/jwysiwyg/jquery.wysiwyg.js b/static/jwysiwyg/jquery.wysiwyg.js
deleted file mode 120000
index e638395..0000000
--- a/static/jwysiwyg/jquery.wysiwyg.js
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/jquery.wysiwyg.js
\ No newline at end of file
diff --git a/static/jwysiwyg/jquery.wysiwyg.modal.css b/static/jwysiwyg/jquery.wysiwyg.modal.css
deleted file mode 120000
index b742978..0000000
--- a/static/jwysiwyg/jquery.wysiwyg.modal.css
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/jquery.wysiwyg.modal.css
\ No newline at end of file
diff --git a/static/jwysiwyg/jquery.wysiwyg.no-alpha.gif b/static/jwysiwyg/jquery.wysiwyg.no-alpha.gif
deleted file mode 120000
index d20a523..0000000
--- a/static/jwysiwyg/jquery.wysiwyg.no-alpha.gif
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/jquery.wysiwyg.no-alpha.gif
\ No newline at end of file
diff --git a/static/jwysiwyg/jquery.wysiwyg.old-school.css b/static/jwysiwyg/jquery.wysiwyg.old-school.css
deleted file mode 120000
index 1671f19..0000000
--- a/static/jwysiwyg/jquery.wysiwyg.old-school.css
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/jquery.wysiwyg.old-school.css
\ No newline at end of file
diff --git a/static/jwysiwyg/plugins b/static/jwysiwyg/plugins
deleted file mode 120000
index c0dbb7d..0000000
--- a/static/jwysiwyg/plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../deps/jwysiwyg/plugins
\ No newline at end of file
diff --git a/static/style-rtl.css b/static/style-rtl.css
index 25cbd1e..0db37f0 100644
--- a/static/style-rtl.css
+++ b/static/style-rtl.css
@@ -456,12 +456,12 @@ td.actions .button {
     border: 0;
 }
 
-#post-body {
+#content {
     max-width:600px;
     padding:8px;
 }
 
-#post-body img {
+#content img {
     clear: both;
     float: right;
     border: none;
diff --git a/static/style.css b/static/style.css
index 1fae09d..8ff5062 100644
--- a/static/style.css
+++ b/static/style.css
@@ -453,12 +453,12 @@ td.actions .button {
     border: 0;
 }
 
-#post-body {
+#content {
     max-width:600px;
     padding:8px;
 }
 
-#post-body img {
+#content img {
     clear: both;
     float: left;
     border: none;
diff --git a/templates/404.html b/templates/404.html
index dd545c5..6bb3d6e 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -1 +1 @@
-<h1>404 - Not Found :(</h1>
+<h3>404 - Not Found :(</h3>
diff --git a/templates/base.html b/templates/base.html
index ec60326..caa9cd7 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -4,18 +4,25 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 
     <link rel="stylesheet" type="text/css" href="{baseURL}/static/{?config.rtl}style-rtl.css{:else}style.css{/config.rtl}" /> 
     {#config.extra_css}<link rel="stylesheet" type="text/css" href="{baseURL}/static/{.}" />{~n}{/config.extra_css} 
-    <script src="{baseURL}/static/js/jquery-1.6.2.js"></script>
-    <script src="{baseURL}/kanso.js"></script>
     <title>{title}</title> 
   </head> 
   <body>
     <a target="_blank" href="http://github.com/thedod/kansoblog"><img id="github-ribbon" src="{baseURL}/static/images/{?config.rtl}github-ribbon-rtl.png{:else}github-ribbon.png{/config.rtl}" alt="Fork me on GitHub"></a>
     {>"session.html"/}
-    <h1 class="site name"><a href="{baseURL}/">{config.site_name}</a></h1>
+    <h1 class="site name"><a href="{baseURL}/">{config.site_name}</a> <span id="breadcrumbs">{breadcrumbs|s}</span></h1>
+    {>"flashmessages.html"/}
     <div id="content">
       {content|s}
     </div>
+    <div id="actions"></div>
+    <script src="{baseURL}/static/js/jquery-1.6.2.js"></script>
     <script src="{baseURL}/static/js/json2.js"></script>
-    <script src="{baseURL}/static/js/jquery.simplemodal-1.4.1.js"></script>
+    <link rel="stylesheet" href="{baseURL}/static/jwysiwyg/jquery.wysiwyg.css" type="text/css"/>
+    <script type="text/javascript" src="{baseURL}/static/jwysiwyg/jquery.wysiwyg.js"></script>
+    <script type="text/javascript" src="{baseURL}/static/jwysiwyg/controls/wysiwyg.link.js"></script>
+    <script type="text/javascript" src="{baseURL}/static/jwysiwyg/controls/wysiwyg.image.js"></script>
+    <script type="text/javascript" src="{baseURL}/static/wysiwyg_controls.js"></script>
+    <script type="text/javascript" src="{baseURL}/static/js/jquery.simplemodal-1.4.1.js"></script>
+    <script type="text/javascript" src="{baseURL}/kanso.js"></script>
   </body>
 </html>
diff --git a/templates/blogpost.html b/templates/blogpost.html
index 0ea555d..12f4160 100644
--- a/templates/blogpost.html
+++ b/templates/blogpost.html
@@ -1,29 +1,10 @@
-<script src="{baseURL}/static/js/sanitize_js/sanitize.js"></script>
-<script src="{baseURL}/static/js/sanitize_js/sanitize/config/relaxed.js"></script>
-<script type="text/javascript">
-    // Add nofollow and _blank to all links coming from user input
-    Sanitize.Config.RELAXED.add_attributes={a:{rel:'nofollow', target:'_blank'}};
-</script>
-     
-<h1>{title}</h1>
 <div id="post-body">
 <img src="{baseURL}/static/images/spinner-small.gif">
 <noscript>
 <h3 style="direction:ltr">Html-quoted content (turn javascript on to view sanitized html):</h3>
 <p style="direction:ltr">{text}</p>
 </noscript>
-</div>
 <script type="text/javascript">
-$(function() {
-    $('#post-body').html(new Sanitize(Sanitize.Config.RELAXED).clean_node(
-        $('<span>'+unescape('{escaped}').replace(/<script/gi,'&lt;script')+'</span>').get(0)
-    ));
-});
+    window.escaped_post='{escaped|s}';
 </script>
-
-<div id="actions">
-    <form method="POST" action="{basurl}/delete/{_id}">
-        <a href="{baseURL}/edit/{_id}">Edit</a>
-        <input type="submit" value="Delete">
-    </form>
 </div>
diff --git a/templates/blogpost_actions.html b/templates/blogpost_actions.html
new file mode 100644
index 0000000..f907380
--- /dev/null
+++ b/templates/blogpost_actions.html
@@ -0,0 +1,6 @@
+<div id="actions">
+    <form method="POST" action="{basurl}/delete/{_id}">
+        <a href="{baseURL}/edit/{_id}">Edit</a>
+        <input type="submit" value="Delete">
+    </form>
+</div>
diff --git a/templates/blogpost_form.html b/templates/blogpost_form.html
index f077c09..8a72e6d 100644
--- a/templates/blogpost_form.html
+++ b/templates/blogpost_form.html
@@ -1,25 +1,6 @@
-<h1><a href="{baseURL}/{id}">{form_title}</a></h1>
-{>"flashmessages.html"/}
-<link rel="stylesheet" href="{baseURL}/static/jwysiwyg/jquery.wysiwyg.css" type="text/css"/>
-<script type="text/javascript" src="{baseURL}/static/jwysiwyg/jquery.wysiwyg.js"></script>
-<script type="text/javascript" src="{baseURL}/static/jwysiwyg/controls/wysiwyg.link.js"></script>
-<script type="text/javascript" src="{baseURL}/static/jwysiwyg/controls/wysiwyg.image.js"></script>
-<script type="text/javascript" src="{baseURL}/static/wysiwyg_controls.js"></script>
-
 <form method="POST" action="">
   <table>
     {form|s}
   </table>
   <input type="submit" value="{button_label}" />
 </form>
-
-<script type="text/javascript">
-$(function() {
-	$('#id_text').wysiwyg({
-                controls:window.wysiwyg_controls,
-                {?config.rtl}css: {direction:'rtl'},{/config.rtl}
-                initialContent:''
-        });
-	$('#id_title').focus();
-});  
-</script>
diff --git a/templates/blogposts.html b/templates/blogposts.html
index b5f937a..ae58501 100644
--- a/templates/blogposts.html
+++ b/templates/blogposts.html
@@ -7,7 +7,3 @@
   {:else}
   <p>No blog posts</p>
 {/rows}
-
-<div id="actions">
-<a href="{baseURL}/add">Add new</a>
-</div>
diff --git a/templates/blogposts_actions.html b/templates/blogposts_actions.html
new file mode 100644
index 0000000..dc933b8
--- /dev/null
+++ b/templates/blogposts_actions.html
@@ -0,0 +1 @@
+<a href="{baseURL}/add">Add new</a>