HighlightDialog refactored