HTML and whitespace fixes