Rolled back ui display to all attributes.

There are several things in this diff that don't have anything to do with the change in question.