Refactored CategoryActivity