changed events api
code review & cleanup
Merge branch 'feature/navigation' into develop