Html refactor