Fix slideshow
Merge branch 'staging'