cleaned up MapPanel