Rearranged the pivot items and added the missing properties to the UI.