Made some changes to some things.
Fixed merget conflict for form.js