Few changes to the forms based on testing
Needed to recommit