Refactored the category view into another VC.