Opt in checkbox and some minor form clean up. [#71545066]