Minor popup rendering changes
Minor popup rendering changes