refactoring and image upload bug fix VIIVDOLCOL-200