Simplification refactoring + adds finess feedback in upload window