Updates to popup to try and fix some inconstancies that I was getting