De-duplicate part of the wp-admin user profile template, plus code style  tidy up