fix uploading attachments
change reordering