Improve crop and load original image process