Fix file upload and restructure MenuUpload
I broke the file upload in !210 (merged) (oopsie-daisy !) so I took advantage of the fix to implement the changes underlined in !210 (comment 254019)
I broke the file upload in !210 (merged) (oopsie-daisy !) so I took advantage of the fix to implement the changes underlined in !210 (comment 254019)