A few changes to navigation logic