Add map action to menu, and clean up some more.