Move the options form to be a registered form.
Various form handling changes.