Reorganised image loading