Design and content changes.

(Yes, another brilliant commit message).