Fixed Draw tools after Refactoring