Simplify navigation loop