Updating the attribute type UI.
Merging some conflicts.