OSX fixes and ui cleanup