adjust style for slideshow
resolve merge conflict