refactoring drawer