Added optional close button to popup