Moved graphics-related functionality to Drawer class
Cosmetic changes, mainly to Drawer