Refactored CSS and HTML