Improve UI for upload screen (to be template edit)