refactoring in Drawer