Fix lots of whitespace issues, normalize HTML and JSON views, and display extra information