Refactored CSS and JS