Refactored CSS for components