Dialog: quick refactor WIP