ADD - refactor category listings