some html refactoring