Ordering UI rework

.