Fix sorting of uploaded files to maintain original order.
Update file uploader, revert upload display order.