Map Editor

Improved map editor