Small HTML Refactor