QAUTH-2 - Fixed some of the issues with Image Cropping