_s: Image navigation improvements