HTML cleanups, indentation & spacing fixes