Whitespace and ordering changes to make more similar to index-full.html