Fix a few issues resulting from merge and display errors properly
Attach a file by drag & drop or click to upload
