OA-562: Improve user profile page

Didn't bring in email to the User Info page because it seems to fit better with account considering that in order to change the email, the user must enter the current password. In addition, the $form['mail'] element is currently in the account user category. Can bring email over to the user-info category if strongly desired.