Drawing buttons deactivate correctly when turned off

Fixed Issue #4