UX fixes for upload.py; linebreaks elsewhere