Improved image selector