ERT-592 Refactor of ClosableDialog