Refactor the CSS and move to a more expanded way of writing it
Might as well be consistent with comment headers