HTML refactoring 2