Added better image loading