Refactor UI with hierarchical highlights