Refactor CSS... what a mess!