Bug fixes, Custom Dialog for Testing