Refactor some base template stuff; use includes for certain items, blocks for vars;