Drawer big refactoring