Map Viewer / Editor Bug Fixes