Work on refactoring the slideshow