HTML refactoring

p2-t3