Improve on Dialog setting dialog