Update Jade templates
Updated Jade templates to block based templating. This is more reliable and preferable to using includes for layout templating.