us43497: Popup refactor