Some cleanups and elimination of some duplicate code.
Attach a file by drag & drop or click to upload
