UI improvements to popup