Add disabled and autofocus status to extra form buttons, and fix to allow enter key to properly submit the form.