finished fix of carousel