Track drawers refactoring