Lots of updates to display features, ordering