Refactored categories to be in one screen