Added return to all event handlers. Some were missed. #227
Merge branch 'master' into new-admin-dashboard