Fixed up the navigation methods to be more flexible.