ticket:2 dialog logic, ui  fix