Dialog improvments