Better handling of crop mode on image setting