Improve uploading UI #18