Refactoring the upload interface to have a single screen.