Form fixes

The two files now have the same order of input variables.