General cleanup
Removed old testmap
Changed name of map to envLayer in MapViewer