Clean up whitespace and close tags

A few more fixes for HTML bugs that were effecting the layout.