add Carousel and bugfix