Fix form field bug in contributions.js
Merge Simon and Will progress
Fix a few bugs from merge
Remerge Simon and Will