Fixed brush and rectangle to have correct translation
Merged, brush now updates the map