Improved image crop with correct scaling