Finished HTML refactoring