Refactor category selector