Cleaned up some of the problems in the markup.

Used table when appropriate (outline vs block vs flow).
Cleaned up whitespace.
Stopped comments from being leaked to the browser.