diff --git a/data/config.ini b/data/config.ini
index 9fe2e4f6..e178b64a 100644
--- a/data/config.ini
+++ b/data/config.ini
@@ -1,5 +1,5 @@
 [chibi]
-prettyPrint=1
+enableCache=1
 
 [main]
 dbDriver   = "sqlite"
diff --git a/lib/chibi-core b/lib/chibi-core
index 9653960e..4628a3d8 160000
--- a/lib/chibi-core
+++ b/lib/chibi-core
@@ -1 +1 @@
-Subproject commit 9653960e235c2c932bce404d3fe8ff4ea3990e08
+Subproject commit 4628a3d8dde54b411294be6c07b62a163cd9c774
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
index 9e2cb4ce..6b581cfc 100644
--- a/src/Bootstrap.php
+++ b/src/Bootstrap.php
@@ -3,24 +3,10 @@ class Bootstrap
 {
 	public function render($callback = null)
 	{
-		if ($callback === null)
-		{
-			$callback = function()
-			{
-				(new \Chibi\View())->renderFile($this->context->layoutName);
-			};
-		}
-
-		if ($this->context->layoutName == 'layout-normal')
-		{
-			ob_start(['LayoutHelper', 'transformHtml']);
+		if ($callback !== null)
 			$callback();
-			ob_end_flush();
-		}
 		else
-		{
-			$callback();
-		}
+			(new \Chibi\View())->renderFile($this->context->layoutName);
 	}
 
 	public function workWrapper($workCallback)
@@ -29,7 +15,7 @@ class Bootstrap
 		session_start();
 
 		$this->context->handleExceptions = false;
-		LayoutHelper::setTitle($this->config->main->title);
+		CustomAssetViewDecorator::setTitle($this->config->main->title);
 
 		$this->context->json = isset($_GET['json']);
 		$this->context->layoutName = $this->context->json
@@ -48,6 +34,8 @@ class Bootstrap
 			return;
 		}
 
+		$this->context->viewDecorators []= new CustomAssetViewDecorator();
+		$this->context->viewDecorators []= new \Chibi\PrettyPrintViewDecorator();
 		try
 		{
 			$this->render($workCallback);
diff --git a/src/Helpers/CustomAssetViewDecorator.php b/src/Helpers/CustomAssetViewDecorator.php
new file mode 100644
index 00000000..86acb35c
--- /dev/null
+++ b/src/Helpers/CustomAssetViewDecorator.php
@@ -0,0 +1,40 @@
+<?php
+class CustomAssetViewDecorator extends \Chibi\AssetViewDecorator
+{
+	private static $pageThumb = null;
+	private static $subTitle = null;
+
+	public static function setSubTitle($text)
+	{
+		self::$subTitle = $text;
+	}
+
+	public static function setPageThumb($path)
+	{
+		self::$pageThumb = $path;
+	}
+
+	public function transformHtml($html)
+	{
+		self::$title = isset(self::$subTitle)
+			? sprintf('%s&nbsp;&ndash;&nbsp;%s', self::$title, self::$subTitle)
+			: self::$title;
+
+		$html = parent::transformHtml($html);
+
+		$headSnippet = '<meta property="og:title" content="' . self::$title . '"/>';
+		$headSnippet .= '<meta property="og:url" content="' . \Chibi\UrlHelper::currentUrl() . '"/>';
+		if (!empty(self::$pageThumb))
+			$headSnippet .= '<meta property="og:image" content="' . self::$pageThumb . '"/>';
+
+		$bodySnippet = '<script type="text/javascript">';
+		$bodySnippet .= '$(function() {';
+		$bodySnippet .= '$(\'body\').trigger(\'dom-update\');';
+		$bodySnippet .= '});';
+		$bodySnippet .= '</script>';
+
+		$html = str_replace('</head>', $headSnippet . '</head>', $html);
+		$html = str_replace('</body>', $bodySnippet . '</body>', $html);
+		return $html;
+	}
+}
diff --git a/src/Helpers/LayoutHelper.php b/src/Helpers/LayoutHelper.php
deleted file mode 100644
index a4ce0a92..00000000
--- a/src/Helpers/LayoutHelper.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-class LayoutHelper
-{
-	private static $stylesheets = [];
-	private static $scripts = [];
-	private static $title = null;
-	private static $pageThumb = null;
-	private static $subTitle = null;
-
-	public static function setTitle($text)
-	{
-		self::$title = $text;
-	}
-
-	public static function setSubTitle($text)
-	{
-		self::$subTitle = $text;
-	}
-
-	public static function setPageThumb($path)
-	{
-		self::$pageThumb = $path;
-	}
-
-	public static function addStylesheet($css)
-	{
-		self::$stylesheets []= $css;
-	}
-
-	public static function addScript($js)
-	{
-		self::$scripts []= $js;
-	}
-
-	public static function transformHtml($html)
-	{
-		$bodySnippet = '';
-		$headSnippet = '';
-
-		$title = isset(self::$subTitle)
-			? sprintf('%s&nbsp;&ndash;&nbsp;%s', self::$title, self::$subTitle)
-			: self::$title;
-		$headSnippet .= '<title>' . $title . '</title>';
-
-		$headSnippet .= '<meta property="og:title" content="' . $title . '"/>';
-		$headSnippet .= '<meta property="og:url" content="' . \Chibi\UrlHelper::currentUrl() . '"/>';
-		if (!empty(self::$pageThumb))
-			$headSnippet .= '<meta property="og:image" content="' . self::$pageThumb . '"/>';
-
-		foreach (array_unique(self::$stylesheets) as $name)
-			$headSnippet .= '<link rel="stylesheet" type="text/css" href="' . \Chibi\UrlHelper::absoluteUrl('/media/css/' . $name) . '"/>';
-
-		foreach (array_unique(self::$scripts) as $name)
-			$bodySnippet .= '<script type="text/javascript" src="' . \Chibi\UrlHelper::absoluteUrl('/media/js/' . $name)  . '"></script>';
-
-		$bodySnippet .= '<script type="text/javascript">';
-		$bodySnippet .= '$(function() {';
-		$bodySnippet .= '$(\'body\').trigger(\'dom-update\');';
-		$bodySnippet .= '});';
-		$bodySnippet .= '</script>';
-
-		$html = str_replace('</head>', $headSnippet . '</head>', $html);
-		$html = str_replace('</body>', $bodySnippet . '</body>', $html);
-		return $html;
-	}
-}
diff --git a/src/Views/auth-login.phtml b/src/Views/auth-login.phtml
index 4defa9af..5c72cbd8 100644
--- a/src/Views/auth-login.phtml
+++ b/src/Views/auth-login.phtml
@@ -1,6 +1,6 @@
 <?php
-LayoutHelper::setSubTitle('authentication form');
-LayoutHelper::addStylesheet('auth.css');
+CustomAssetViewDecorator::setSubTitle('authentication form');
+CustomAssetViewDecorator::addStylesheet('auth.css');
 ?>
 
 <form action="<?php echo \Chibi\UrlHelper::route('auth', 'login') ?>" class="auth" method="post">
diff --git a/src/Views/comment-add.phtml b/src/Views/comment-add.phtml
index ca581dc2..bfd9734f 100644
--- a/src/Views/comment-add.phtml
+++ b/src/Views/comment-add.phtml
@@ -1,6 +1,6 @@
 <?php
-LayoutHelper::addStylesheet('comment-edit.css');
-LayoutHelper::addScript('comment-edit.js');
+CustomAssetViewDecorator::addStylesheet('comment-edit.css');
+CustomAssetViewDecorator::addScript('comment-edit.js');
 ?>
 
 <form action="<?php echo \Chibi\UrlHelper::route('comment', 'add', ['postId' => $this->context->transport->post->id]) ?>" method="post" class="add-comment">
diff --git a/src/Views/comment-edit.phtml b/src/Views/comment-edit.phtml
index 6069f03a..e368d5ef 100644
--- a/src/Views/comment-edit.phtml
+++ b/src/Views/comment-edit.phtml
@@ -1,6 +1,6 @@
 <?php
-LayoutHelper::addStylesheet('comment-edit.css');
-LayoutHelper::addScript('comment-edit.js');
+CustomAssetViewDecorator::addStylesheet('comment-edit.css');
+CustomAssetViewDecorator::addScript('comment-edit.js');
 ?>
 
 <form action="<?php echo \Chibi\UrlHelper::route('comment', 'edit', ['id' => $this->context->transport->comment->id]) ?>" method="post" class="edit-comment">
diff --git a/src/Views/comment-list.phtml b/src/Views/comment-list.phtml
index 91caa144..021b26da 100644
--- a/src/Views/comment-list.phtml
+++ b/src/Views/comment-list.phtml
@@ -1,15 +1,15 @@
 <?php
-LayoutHelper::setSubTitle('comments');
+CustomAssetViewDecorator::setSubTitle('comments');
 ?>
 
 <?php if (empty($this->context->transport->posts)): ?>
 	<p class="alert alert-warning">No comments to show.</p>
 <?php else: ?>
 	<?php
-	LayoutHelper::addStylesheet('comment-list.css');
-	LayoutHelper::addStylesheet('comment-small.css');
-	LayoutHelper::addStylesheet('comment-edit.css');
-	LayoutHelper::addScript('comment-edit.js');
+	CustomAssetViewDecorator::addStylesheet('comment-list.css');
+	CustomAssetViewDecorator::addStylesheet('comment-small.css');
+	CustomAssetViewDecorator::addStylesheet('comment-edit.css');
+	CustomAssetViewDecorator::addScript('comment-edit.js');
 	?>
 
 	<div class="comments-wrapper">
diff --git a/src/Views/comment-small.phtml b/src/Views/comment-small.phtml
index f9567def..4a2aabea 100644
--- a/src/Views/comment-small.phtml
+++ b/src/Views/comment-small.phtml
@@ -1,7 +1,7 @@
 <?php
-LayoutHelper::addStylesheet('comment-small.css');
-LayoutHelper::addStylesheet('comment-edit.css');
-LayoutHelper::addScript('comment-edit.js');
+CustomAssetViewDecorator::addStylesheet('comment-small.css');
+CustomAssetViewDecorator::addStylesheet('comment-edit.css');
+CustomAssetViewDecorator::addScript('comment-edit.js');
 ?>
 
 <div class="comment">
diff --git a/src/Views/debug.phtml b/src/Views/debug.phtml
index d49d2973..80c3ac62 100644
--- a/src/Views/debug.phtml
+++ b/src/Views/debug.phtml
@@ -1,4 +1,4 @@
-<?php LayoutHelper::addStylesheet('debug.css') ?>
+<?php CustomAssetViewDecorator::addStylesheet('debug.css') ?>
 <div class="main-wrapper">
 	<?php foreach (Database::getLogs() as $log): ?>
 		<div class="debug">
diff --git a/src/Views/index-help.phtml b/src/Views/index-help.phtml
index d231edb7..94519725 100644
--- a/src/Views/index-help.phtml
+++ b/src/Views/index-help.phtml
@@ -1,6 +1,6 @@
 <?php
-LayoutHelper::setSubtitle('help');
-LayoutHelper::addStylesheet('index-help.css');
+CustomAssetViewDecorator::setSubtitle('help');
+CustomAssetViewDecorator::addStylesheet('index-help.css');
 
 $tabs = $this->config->help->subTitles;
 $firstTab = !empty($tabs) ? array_keys($tabs)[0] : null;
diff --git a/src/Views/index-index.phtml b/src/Views/index-index.phtml
index e5523586..b44ca4f8 100644
--- a/src/Views/index-index.phtml
+++ b/src/Views/index-index.phtml
@@ -1,6 +1,6 @@
 <?php
-LayoutHelper::setSubtitle('home');
-LayoutHelper::addStylesheet('index-index.css');
+CustomAssetViewDecorator::setSubtitle('home');
+CustomAssetViewDecorator::addStylesheet('index-index.css');
 ?>
 
 <div id="welcome">
diff --git a/src/Views/layout-normal.phtml b/src/Views/layout-normal.phtml
index a7f440bd..ace048bf 100644
--- a/src/Views/layout-normal.phtml
+++ b/src/Views/layout-normal.phtml
@@ -1,10 +1,10 @@
 <?php
-LayoutHelper::addStylesheet('../lib/jquery-ui/jquery-ui.css');
-LayoutHelper::addStylesheet('core.css');
-LayoutHelper::addScript('../lib/jquery/jquery.min.js');
-LayoutHelper::addScript('../lib/jquery-ui/jquery-ui.min.js');
-LayoutHelper::addScript('../lib/mousetrap/mousetrap.min.js');
-LayoutHelper::addScript('core.js');
+CustomAssetViewDecorator::addStylesheet('../lib/jquery-ui/jquery-ui.css');
+CustomAssetViewDecorator::addStylesheet('core.css');
+CustomAssetViewDecorator::addScript('../lib/jquery/jquery.min.js');
+CustomAssetViewDecorator::addScript('../lib/jquery-ui/jquery-ui.min.js');
+CustomAssetViewDecorator::addScript('../lib/mousetrap/mousetrap.min.js');
+CustomAssetViewDecorator::addScript('core.js');
 ?>
 
 <!DOCTYPE html>
diff --git a/src/Views/log-view.phtml b/src/Views/log-view.phtml
index 91cf6ccc..a0b9827d 100644
--- a/src/Views/log-view.phtml
+++ b/src/Views/log-view.phtml
@@ -1,13 +1,13 @@
 <?php
-LayoutHelper::setSubTitle('logs (' . $name . ')');
+CustomAssetViewDecorator::setSubTitle('logs (' . $name . ')');
 ?>
 
 <?php if (empty($this->context->transport->lines)): ?>
 	<p class="alert alert-warning">This log is empty. <a href="<?php echo \Chibi\UrlHelper::route('log', 'list') ?>">Go back</a></p>
 <?php else: ?>
 	<?php
-	LayoutHelper::addStylesheet('logs.css');
-	LayoutHelper::addScript('logs.js');
+	CustomAssetViewDecorator::addStylesheet('logs.css');
+	CustomAssetViewDecorator::addScript('logs.js');
 	?>
 
 	<form action="<?php echo \Chibi\UrlHelper::route('log', 'view', ['name' => $this->context->transport->name]) ?>" method="get">
diff --git a/src/Views/paginator.phtml b/src/Views/paginator.phtml
index 2ac00a64..4b037f11 100644
--- a/src/Views/paginator.phtml
+++ b/src/Views/paginator.phtml
@@ -42,9 +42,9 @@ if (!function_exists('pageUrl'))
 
 <?php if (!empty($pagesVisible)): ?>
 	<?php
-	LayoutHelper::addStylesheet('paginator.css');
+	CustomAssetViewDecorator::addStylesheet('paginator.css');
 	if ($this->context->user->hasEnabledEndlessScrolling())
-		LayoutHelper::addScript('paginator-endless.js');
+		CustomAssetViewDecorator::addScript('paginator-endless.js');
 	?>
 
 	<nav class="paginator-wrapper">
diff --git a/src/Views/post-file-render.phtml b/src/Views/post-file-render.phtml
index 1480ab18..1dedd668 100644
--- a/src/Views/post-file-render.phtml
+++ b/src/Views/post-file-render.phtml
@@ -1,4 +1,4 @@
-<?php LayoutHelper::setPageThumb(\Chibi\UrlHelper::route('post', 'thumb', ['name' => $this->context->transport->post->name])) ?>
+<?php CustomAssetViewDecorator::setPageThumb(\Chibi\UrlHelper::route('post', 'thumb', ['name' => $this->context->transport->post->name])) ?>
 <?php $post = $this->context->transport->post ?>
 
 <?php if ($post->type == PostType::Image): ?>
diff --git a/src/Views/post-list-wrapper.phtml b/src/Views/post-list-wrapper.phtml
index 41f364b2..e95d1ac7 100644
--- a/src/Views/post-list-wrapper.phtml
+++ b/src/Views/post-list-wrapper.phtml
@@ -1,5 +1,5 @@
 <?php
-LayoutHelper::setSubTitle('posts');
+CustomAssetViewDecorator::setSubTitle('posts');
 
 $tabs = [];
 if (PrivilegesHelper::confirm(Privilege::ListPosts))
diff --git a/src/Views/post-list.phtml b/src/Views/post-list.phtml
index 06f1b9fd..ce24cc89 100644
--- a/src/Views/post-list.phtml
+++ b/src/Views/post-list.phtml
@@ -1,6 +1,6 @@
 <?php
-LayoutHelper::addStylesheet('post-list.css');
-LayoutHelper::addScript('post-list.js');
+CustomAssetViewDecorator::addStylesheet('post-list.css');
+CustomAssetViewDecorator::addScript('post-list.js');
 ?>
 
 <?php if (isset($this->context->source) and $this->context->source == 'mass-tag' and PrivilegesHelper::confirm(Privilege::MassTag)): ?>
diff --git a/src/Views/post-small.phtml b/src/Views/post-small.phtml
index f872a314..59761bc4 100644
--- a/src/Views/post-small.phtml
+++ b/src/Views/post-small.phtml
@@ -1,5 +1,5 @@
 <?php
-LayoutHelper::addStylesheet('post-small.css');
+CustomAssetViewDecorator::addStylesheet('post-small.css');
 
 $classNames =
 [
diff --git a/src/Views/post-upload.phtml b/src/Views/post-upload.phtml
index 0e32d14a..fb1744ae 100644
--- a/src/Views/post-upload.phtml
+++ b/src/Views/post-upload.phtml
@@ -1,9 +1,9 @@
 <?php
-LayoutHelper::setSubTitle('upload');
-LayoutHelper::addStylesheet('post-upload.css');
-LayoutHelper::addScript('post-upload.js');
-LayoutHelper::addStylesheet('../lib/tagit/jquery.tagit.css');
-LayoutHelper::addScript('../lib/tagit/jquery.tagit.js');
+CustomAssetViewDecorator::setSubTitle('upload');
+CustomAssetViewDecorator::addStylesheet('post-upload.css');
+CustomAssetViewDecorator::addScript('post-upload.js');
+CustomAssetViewDecorator::addStylesheet('../lib/tagit/jquery.tagit.css');
+CustomAssetViewDecorator::addScript('../lib/tagit/jquery.tagit.js');
 ?>
 
 <div id="sidebar">
diff --git a/src/Views/post-view.phtml b/src/Views/post-view.phtml
index bd489c5a..c3ca2092 100644
--- a/src/Views/post-view.phtml
+++ b/src/Views/post-view.phtml
@@ -1,9 +1,9 @@
 <?php
-LayoutHelper::setSubTitle('showing ' . TextHelper::reprPost($this->context->transport->post) . ' &ndash; ' . TextHelper::reprTags($this->context->transport->post->getTags()));
-LayoutHelper::addStylesheet('post-view.css');
-LayoutHelper::addScript('post-view.js');
-LayoutHelper::addStylesheet('../lib/tagit/jquery.tagit.css');
-LayoutHelper::addScript('../lib/tagit/jquery.tagit.js');
+CustomAssetViewDecorator::setSubTitle('showing ' . TextHelper::reprPost($this->context->transport->post) . ' &ndash; ' . TextHelper::reprTags($this->context->transport->post->getTags()));
+CustomAssetViewDecorator::addStylesheet('post-view.css');
+CustomAssetViewDecorator::addScript('post-view.js');
+CustomAssetViewDecorator::addStylesheet('../lib/tagit/jquery.tagit.css');
+CustomAssetViewDecorator::addScript('../lib/tagit/jquery.tagit.js');
 
 $editPostPrivileges = [
 	Privilege::EditPostSafety,
@@ -318,8 +318,8 @@ $canEditAnything = count(array_filter($editPostPrivileges)) > 0;
 	</div>
 
 	<?php
-	LayoutHelper::addStylesheet('comment-list.css');
-	LayoutHelper::addStylesheet('comment-small.css');
+	CustomAssetViewDecorator::addStylesheet('comment-list.css');
+	CustomAssetViewDecorator::addStylesheet('comment-small.css');
 	?>
 	<div class="comments-wrapper">
 		<?php if (!empty($this->context->transport->post->getComments())): ?>
diff --git a/src/Views/tag-list-wrapper.phtml b/src/Views/tag-list-wrapper.phtml
index d661c5e1..33425fa9 100644
--- a/src/Views/tag-list-wrapper.phtml
+++ b/src/Views/tag-list-wrapper.phtml
@@ -1,6 +1,6 @@
 <?php
-LayoutHelper::setSubTitle('tags');
-LayoutHelper::addStylesheet('tag-list.css');
+CustomAssetViewDecorator::setSubTitle('tags');
+CustomAssetViewDecorator::addStylesheet('tag-list.css');
 
 $tabs = [];
 if (PrivilegesHelper::confirm(Privilege::ListTags)) $tabs['list'] = 'List';
diff --git a/src/Views/user-list.phtml b/src/Views/user-list.phtml
index 7119f9ef..f4dc703a 100644
--- a/src/Views/user-list.phtml
+++ b/src/Views/user-list.phtml
@@ -1,9 +1,9 @@
 <?php
-LayoutHelper::setSubTitle('users');
-LayoutHelper::addStylesheet('user-list.css');
-LayoutHelper::addStylesheet('paginator.css');
+CustomAssetViewDecorator::setSubTitle('users');
+CustomAssetViewDecorator::addStylesheet('user-list.css');
+CustomAssetViewDecorator::addStylesheet('paginator.css');
 if ($this->context->user->hasEnabledEndlessScrolling())
-	LayoutHelper::addScript('paginator-endless.js');
+	CustomAssetViewDecorator::addScript('paginator-endless.js');
 ?>
 
 <nav class="sort-styles">
diff --git a/src/Views/user-registration.phtml b/src/Views/user-registration.phtml
index e4a0e5f3..8d2688f4 100644
--- a/src/Views/user-registration.phtml
+++ b/src/Views/user-registration.phtml
@@ -1,12 +1,12 @@
 <?php
-LayoutHelper::setSubTitle('registration form');
+CustomAssetViewDecorator::setSubTitle('registration form');
 ?>
 
 <?php if ($this->context->transport->success === true): ?>
 	<?php $this->renderFile('message') ?>
 <?php else: ?>
 	<?php
-	LayoutHelper::addStylesheet('auth.css');
+	CustomAssetViewDecorator::addStylesheet('auth.css');
 	?>
 
 	<form action="<?php echo \Chibi\UrlHelper::route('auth', 'register') ?>" class="auth" method="post">
diff --git a/src/Views/user-select.phtml b/src/Views/user-select.phtml
index 35f8ea6b..76895c7d 100644
--- a/src/Views/user-select.phtml
+++ b/src/Views/user-select.phtml
@@ -2,7 +2,7 @@
 	<?php $this->renderFile('message') ?>
 <?php else: ?>
 	<?php
-	LayoutHelper::addStylesheet('auth.css');
+	CustomAssetViewDecorator::addStylesheet('auth.css');
 	?>
 
 	<form action="<?php echo \Chibi\UrlHelper::route($this->context->route->simpleControllerName, $this->context->route->simpleActionName) ?>" method="post" class="auth" autocomplete="off">
diff --git a/src/Views/user-view.phtml b/src/Views/user-view.phtml
index e107bebf..63d345e7 100644
--- a/src/Views/user-view.phtml
+++ b/src/Views/user-view.phtml
@@ -1,6 +1,6 @@
 <?php
-LayoutHelper::setSubTitle($this->context->transport->user->name);
-LayoutHelper::addStylesheet('user-view.css');
+CustomAssetViewDecorator::setSubTitle($this->context->transport->user->name);
+CustomAssetViewDecorator::addStylesheet('user-view.css');
 ?>
 
 <div id="sidebar">