Improve design of dialogs