Added new close button icons. Abstracted the popup windows out to standardize creation.