improve carrousel views
Merge branch 'bugfix' into develop