Add the add/remove buttons for the attribute items, and improved layout.