Add formatted categories to reduce view logic
Move logic into model