Improvement to dialog layout