Minor fix: Map window now returns after 'x'ing it out and disappears and appears with the map.