Fixed the loader and the loading of images