Move mapData to variable, change popup options