MCH Forms Improvements

Included additional concepts. Improved form XML and JavaScript.