Fixed a number of MODS form issues

Based on ticket #1094 in OnTime.
Merge pull request #28 from dwilcox/7.x

Fixed a number of MODS form issues