fix layouts and carosel