typo fix in popup
More popup cleanup