map toggle button, more cleanup