minor refac + loading of images from locations