Format dialog work

BL-690, 691, 692 fixed and dialog UI unified