Ui Placement fixes and event tinkering
Merge branch 'master' of https://github.com/prgoodwin/surfaceRepo