Carousel fixes

Final carousel version