added slideshow, refactor