Whitespace and formatting changes to html templates