Move drawing logic to drawers

Close #1106.
You changed the spacing above, and I'm a fan of the spacing above.  Can you mirror the spacing here?