Move drawing logic to drawers

Close #1106.
Minor but still slightly visually off, spacing