Switch events to User.
Fix GlobalWindow always being away.
Merge pull request #197 from greboid/tidying2

Switch events to User.