GUI-1211
UX cleanup and ensure upload go into proper folder