Added more code for choose product picture flow.