Added carousel and fixed scaffolding