Better image loading flow