Multiple fixes for uploader UI