added data-choice on images and refactored code