Fixing a problem where if the user hits enter in the form field.

* the first button in the form would be clicked instead of the "submit" event, even if the first button is hidden.
* Changed the order of the DOM so that the correct button comes first in the DOM.