Better navigation handling