Fixed the Dialog issues