Popup rendering tweaks