added more handleing for the map controls