Ordering and other UI cleanup