Small changes in upload controller and UI