More HTML cleanup (THANKS DAVID)
Revert "More HTML cleanup (THANKS DAVID)"

This reverts commit 4f8ba74e637bfbfffb27a1cd8dfa549ff5c7bf55.