Made one submit button, reorganized file upload