added slider on index
merge conflict on navbar