Finally fixed the carousel