Working on improvements for PandaCarousel