Minor popup rendering tweaks