Move drawing logic to drawers

Close #1106.
"tslint should have caught" -> fix tslint rather than trying to enforce in CR.