Improve map popup