Refactor code, able to add preview image to wish