cleaned up mapviewer