Adjusted to keep arrow on popups