popup/zoom fixes