UI bug fixes
Upload working