Improvements to dialog