Another round of changes.
Finished this round of aesthetic revisions.