Refactor category menu