Fixes for new upload view