Big tidy up of Edit profile page. [fixes #52178297]