Drawer now uses one function to draw borders