Carousel issues fixed