Html structure refactoring