Fixed popups + circles with zooming issues