Dialog improvements