Refactoring to include all graphics code in Drawer