Add images and url generator
Refactor images