Move drawing logic to drawers

Close #1106.
Spacing as above