Minor changes to navigation, events