reordered video functions
Merge branch 'master' of https://github.com/arkassay/pb-scaffold