Little fixes to image upload and image picker dialog