Improved popups for EQ layer. Towards #17