Readded events to navigation
Merge branch 'dev'