Fixes the pattern for some TODOs to match our style guide. (Also, a couple of minor code order fixes.)
Attach a file by drag & drop or click to upload
