Reorder items
Consistent style