bug fixes and ui cleanup
convert prefpane to app
Merge remote-tracking branch 'origin/master' into develop