Move drawing logic to drawers

Close #1106.
Seems specific to drawers.  Move there?