Refactor: create image selection