Assorted styling fixes