Assorted styling improvements