Added custom categories. No sorting yet