Fixes to upload form and interaction