A range of css refactoring and tweaks.
Merge remote-tracking branch 'origin/develop' into develop