DMPT and self-submit help fixes

Corrected some problems with the self-submit help texts which weren’t
appearing because they were attached to the wrong sorts of form
elements. These changes merged with some help corrections that hadn’t
been put on GithHub