Some html refactoring.