Change Image privacy and UX improvements