HTML Structure Refactor