Remove more explicity per-element styling in favour of CSS