Refactored dialog class

Removed dialog with escape class