#3437 More HTML refactoring...