Some UI improvements and fixes for OS X