First pass for changed form

Hopefully a fix for the testing error 'Ambiguous match, found 3 elements matching css "#submit"', by using a more specific selector (#101)
Merge pull request #1081 from wxguychris/master

First pass for changed page