fixed ordering, and minor UI updates