Some enhancements.
Minor updates.
Added UI validations to the new dialog.