consolidated add attachments and add picture from file, adjusted modals