Fix UI bugs, add hierarchy level info to sort