Visual tweaks

A couple of misc layout/visual tweaks. See commit messages.