Updated navigation with auto jumps