Reordering the buttons for form submission.

When hitting enter in a form, the first "input[type=submit]" or "button" is clicked.  We have to make sure the input[type=submit] is the first input element.