Added carousel and fixed some bugs