CarouselNavigationController improvements