Refactoring HTML and JS
Updating CSS