Tidying up markup and CSS in the default template.