changes to video page
merge