Some improvements in the navigation through moves.