Modal tweaks, image upload tweaks