Properly handle orientation changes for the map