Fixes for carousel
Merge branch 'style_adds'