added circular carousel and fix some bugs