Attempt fixing empty media saved, and slightly improve UX