Updated to include slideshow viewer