CSS clean-ups