Improved templates and layout typography and styling