Add carrousel and improve some of the display logic