Refactored a bit of CSS