Fixed carousel bug
More modulable architecture