Improvements to Map Editor