Refactor CSS.
Fix commit conflicts.