More dialog improvements