Form; Added more image file name logic