Nest form inputs under form tag

[msmolens]

There are several places where we use form submit buttons where only the button is a child of the form element, not the inputs. Identify all forms and nest all inputs under the form element.