Refactored, removed dulipcated code for Category id drawer