Grouping of Attribute Descriptions

With the recent changes to group attributes together, we now see something like this:

Official Name

Honorific
Name as known to home organization

Given Name*
Name as known to home organization

Middle Name
Name as known to home organization

Family Name
Name as known to home organization

Suffix
Name as known to home organization

It would look better as this:

Official Name
Name as known to home organization

Honorific
Given Name*
Middle Name*
Family Name*
Suffix

The fields and labels are automatically generated; I can see if it can be changed in the controller but if not, this will end up being more javascript.