Minor UI refinements
Naming consistency for OS X