More HTML markup refactoring.