Slight refactoring in the general area while at it...
Attach a file by drag & drop or click to upload
