Fixed Dialog Refresh Issues