Refactored CSS classes