Made some improvement on upload dialog
see previous commit