Add Carousel function and Fix bug