Update tabs to use Categorize function (still need work on CPA chart