more changes for OS X ui