Move some styling out to the CSS where possible