Fix and tidy up the OS X app