Minor tweaks to the form to reflect a few small changes.