Add images and refactor