Fix draw toolbar

Solve some bugs. See commits for more info.