Refactor CSS