More work on the upload form