refactor ui highlighting