update btn & fix sortable images
merge conflict dropzone uploader