updated the images
general refactor