Clearing up white space, fix a few html errors