Improve edit profile form

Change copy and group fields around in a more logical way.