Updating to new circular collection view API. Still a couple bugs