Added some event based navigation