Some more cleanup / simplification about the "Refresh UX" PR.
Attach a file by drag & drop or click to upload
