Upload files testing & improvements

will you have time to fix it, or prefer me or Snir to do it?