Attempts to fix issue #74 but failed. Some cosmetic changes made to the popup.