Styling fixes and other remaining last edits.

Asked for review.