Overhaul image loading