Made carousel work better