Design changes for login and upload, another bug in upload_helper