Add transitions for the main video
And also remove some duplicated code