Add profile fields and tidy up form