Changed ordering on titleView, and replaced text with icons in typeAttributeView