Add popup close button and functionality. Closes #17