Updated carousel to Version 2.0, also some fixing