fixed up the popup windows