Make improvements to Carousel (match CRDL)