Fix categories but needs refactor