Map display and interaction tweaks