Refactored CSS