Fix drawing and removing tools