Switched templates to a layout based system as the old style was pretty dumb. Now makes things a bit simpler and easier to change.