Image navigation fixes