Fix images and loading