Refactored styles and HTML