Neatening up some stylings and tidying up some cruft in templates.