video in slideshow + refactoring and fixes