Fix Cross Crusade categories
Update gems and update pagination