Added enhancements to the popup