a little more work on Mapping Viewer