Remove edit tool & fix map data