Fix Category model and add articles sorted by category