Improved switching between images.