More improvements on slideshow but unfinished

CUSTOM-117