Improvements to the carousel