some changes to file uploader element
fixing merg conflicts