Revert "Revert "CSS cleanup""

This reverts commit 0c2a2b4f2c0e5ec6bb66961f4f615484e262219e.