Navigation logic updates