Add images and many changes