MINOR: Standardize the popups