improving caroussel
correctings bugs update some view
merge conflict resolved