Fixed uploading while editing, added file form
merge image_uploader