Leave out the submenu changes for now. Discussed with: ad@
Attach a file by drag & drop or click to upload