Whitespace and HTML tweaks