Changed loading of images for better perf