Add highlighting in UI