HTML and CSS refactor