Merge pull request #835 from UM-USElab/form-updates

Form updates