Fixed Carousel and positioning
Merge branch 'carousel-fix'