Moved and fixed up the match directive.  Tidied up the profile edit
forms.