[bug883297] Fix for carousel and some spacing